From 721e451ec418e1712f6962404e111f0ebd487389 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Dec 2024 06:30:35 +0000 Subject: gentoo auto-resync : 27:12:2024 - 06:30:34 --- games-strategy/ja2-stracciatella/Manifest | 2 +- .../ja2-stracciatella-0.21.0-r1.ebuild | 278 --------------------- .../ja2-stracciatella-0.21.0-r2.ebuild | 277 ++++++++++++++++++++ 3 files changed, 278 insertions(+), 279 deletions(-) delete mode 100644 games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild create mode 100644 games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild (limited to 'games-strategy/ja2-stracciatella') diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest index 7e029497dd80..208ed783dba0 100644 --- a/games-strategy/ja2-stracciatella/Manifest +++ b/games-strategy/ja2-stracciatella/Manifest @@ -155,5 +155,5 @@ DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2 -EBUILD ja2-stracciatella-0.21.0-r1.ebuild 5561 BLAKE2B 262ee8c014f93ecccb64423bcf75990c3572f393d7f35e1ab2cd5306c4f76144673a07bfde89c74fe94709c798871b5dc58a8a34d6f75850c8a7da51722f67c2 SHA512 1faf0414c15b57d2e4662a7c45bb044750c709dcaaf415370132fa702d69b7757902fe9457ed706784b55015819fe8f58442b9569ba8bb8ad724db9923ad58f3 +EBUILD ja2-stracciatella-0.21.0-r2.ebuild 5530 BLAKE2B 0f7af733fa8196399f1091d1a49b2a78d9853eced340c311614d1c4f0efabe97b4f97cff89d973bfbbb7fd8d30ecabbc64f61529021ba48f039e03d18dcec3ec SHA512 5debca7261c9af119f425261abe426a57e5f4c01fb60b9d4db26f3bbfb769cdce2e587f7149cbb281417a2539754b21173f0889655f4481384c163092eea2032 MISC metadata.xml 631 BLAKE2B 245b93568aa9a38270619635fb0c167a86abc7b567f8af1a3d5e63954446a185a69e3f3c8f672cebbb1dd72e7982c2736851722ad32a001a3af33afdfb974c9c SHA512 411c914e39091873c0a7fd48d5452a0780a6143e0c579447538183365c97a9fe0de7b13c17da787c07561a1be63e0f80b8f55514c451429beb4a94b2bd23aa5e diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild deleted file mode 100644 index f296653e14c9..000000000000 --- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - addr2line@0.17.0 - adler@1.0.2 - ahash@0.7.6 - aho-corasick@0.7.18 - ansi_term@0.11.0 - anyhow@1.0.69 - ascii@0.9.3 - atty@0.2.14 - autocfg@1.1.0 - backtrace@0.3.65 - base64@0.13.1 - bit-set@0.5.3 - bit-vec@0.6.3 - bitflags@1.3.2 - block-buffer@0.10.3 - bytecount@0.6.3 - byteorder@1.4.3 - bytes@1.4.0 - caseless@0.2.1 - cbindgen@0.20.0 - cc@1.0.73 - cesu8@1.1.0 - cfg-if@1.0.0 - clap@2.33.4 - combine@3.8.1 - combine@4.6.4 - crossbeam-channel@0.5.4 - crossbeam-deque@0.8.1 - crossbeam-epoch@0.9.8 - crossbeam-utils@0.8.8 - crypto-common@0.1.6 - cty@0.2.2 - deunicode@0.4.3 - digest@0.10.6 - dirs@4.0.0 - dirs-sys@0.3.7 - dunce@1.0.2 - either@1.6.1 - error-chain@0.12.4 - fancy-regex@0.8.0 - fastrand@1.7.0 - form_urlencoded@1.1.0 - fraction@0.10.0 - generic-array@0.14.5 - getopts@0.2.21 - getrandom@0.2.6 - gimli@0.26.1 - hashbrown@0.12.3 - heck@0.3.3 - hermit-abi@0.1.19 - hex@0.4.3 - idna@0.3.0 - indexmap@1.9.2 - instant@0.1.12 - iso8601@0.4.2 - itoa@1.0.1 - jni@0.14.0 - jni@0.19.0 - jni-sys@0.3.0 - json_comments@0.2.1 - jsonschema@0.16.0 - lazy_static@1.4.0 - libc@0.2.124 - lock_api@0.4.9 - log@0.4.16 - lru@0.8.1 - md-5@0.10.5 - memchr@2.4.1 - memoffset@0.6.5 - minimal-lexical@0.2.1 - miniz_oxide@0.5.1 - ndk@0.7.0 - ndk-sys@0.4.1+23.1.7779620 - nom@7.1.3 - num@0.2.1 - num-bigint@0.2.6 - num-cmp@0.1.0 - num-complex@0.2.4 - num-integer@0.1.45 - num-iter@0.1.43 - num-rational@0.2.4 - num-traits@0.2.15 - num_cpus@1.13.1 - num_enum@0.5.7 - num_enum_derive@0.5.7 - num_threads@0.1.6 - object@0.28.3 - once_cell@1.10.0 - parking_lot@0.12.1 - parking_lot_core@0.9.7 - percent-encoding@2.2.0 - proc-macro-crate@1.1.3 - proc-macro2@1.0.51 - quote@1.0.18 - raw-window-handle@0.5.0 - rayon@1.6.1 - rayon-core@1.10.2 - redox_syscall@0.2.13 - redox_users@0.4.3 - regex@1.7.1 - regex-syntax@0.6.28 - remove_dir_all@0.5.3 - rustc-demangle@0.1.21 - ryu@1.0.9 - same-file@1.0.6 - scopeguard@1.1.0 - send_wrapper@0.6.0 - serde@1.0.152 - serde_derive@1.0.152 - serde_json@1.0.93 - serde_yaml@0.9.17 - simplelog@0.12.0 - slug@0.1.4 - smallvec@1.10.0 - strsim@0.8.0 - syn@1.0.107 - tempfile@3.3.0 - termcolor@1.1.3 - textwrap@0.11.0 - thiserror@1.0.30 - thiserror-impl@1.0.30 - time@0.3.15 - time-macros@0.2.4 - tinyvec@1.6.0 - tinyvec_macros@0.1.1 - toml@0.5.9 - typenum@1.15.0 - unicode-bidi@0.3.10 - unicode-ident@1.0.6 - unicode-normalization@0.1.19 - unicode-segmentation@1.10.1 - unicode-width@0.1.9 - unreachable@1.0.0 - unsafe-libyaml@0.2.5 - url@2.3.1 - uuid@0.8.2 - vec_map@0.8.2 - version_check@0.9.4 - void@1.0.2 - walkdir@2.3.2 - wasi@0.10.2+wasi-snapshot-preview1 - winapi@0.3.9 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-util@0.1.5 - winapi-x86_64-pc-windows-gnu@0.4.0 - windows-sys@0.45.0 - windows-targets@0.42.1 - windows_aarch64_gnullvm@0.42.1 - windows_aarch64_msvc@0.42.1 - windows_i686_gnu@0.42.1 - windows_i686_msvc@0.42.1 - windows_x86_64_gnu@0.42.1 - windows_x86_64_gnullvm@0.42.1 - windows_x86_64_msvc@0.42.1 -" - -# See dependencies/lib-lua/CMakeLists.txt -LUA_COMPAT=( lua5-3 ) - -# proc_macro-span_shrink; update proc-macro2 crate -RUST_MAX_VER="1.71.1" - -inherit cargo cmake flag-o-matic lua-single xdg - -DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime" -HOMEPAGE="https://github.com/ja2-stracciatella/" -SRC_URI=" - https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz - editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf ) -" -SRC_URI+=" $(cargo_crate_uris ${CARGO_CRATES_URIS})" - -LICENSE="public-domain SFI-SCLA" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="cdinstall editor ru-gold test" -# ./ja2 -unittest can't find save files -RESTRICT="!test? ( test ) test" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -DEPEND=" - ${LUA_DEPS} - >=dev-cpp/magic_enum-0.9.5 - >=dev-cpp/sol2-3.3.0 - >=dev-cpp/string-theory-3.1 - >=dev-games/libsmacker-1.1.1 - >=dev-libs/miniaudio-0.11.11 - >=dev-libs/rapidjson-1.1.0 - media-libs/libsdl2[X,sound,video] - >=x11-libs/fltk-1.3.5[opengl] -" -RDEPEND=" - ${DEPEND} - cdinstall? ( games-strategy/ja2-stracciatella-data ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.20.0-lua-cmake.patch -) - -pkg_setup() { - lua-single_pkg_setup - rust_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/916965 - # https://github.com/ja2-stracciatella/ja2-stracciatella/issues/1963 - filter-lto - - local mycmakeargs=( - -DUSE_SCCACHE=OFF - - -DLOCAL_GTEST_LIB=OFF - -DLOCAL_FLTK_LIB=OFF - - -DLOCAL_LUA_LIB=OFF - -DLUA_VERSION="${ELUA#lua}" - - -DLOCAL_MAGICENUM_LIB=OFF - -DLOCAL_MINIAUDIO_LIB=OFF - -DLOCAL_RAPIDJSON_LIB=OFF - -DLOCAL_SDL_LIB=OFF - -DLOCAL_SOL_LIB=OFF - -DLOCAL_STRING_THEORY_LIB=OFF - - -DWITH_MAGICENUM=OFF - -DWITH_RUST_BINARIES=OFF - -DWITH_UNITTESTS=$(usex test) - - -DBUILD_LAUNCHER=OFF - - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - -DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2" - -DMINIAUDIO_INCLUDE_DIR="${EPREFIX}/usr/include/miniaudio" - -DMAGICENUM_INCLUDE_DIR="${EPREFIX}/usr/include" - ) - - cargo_gen_config - cmake_src_configure -} - -src_install() { - if use editor; then - insinto /usr/share/ja2 - doins "${DISTDIR}/${P}-editor.slf" - dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf" - fi - - cmake_src_install -} - -src_test() { - "${BUILD_DIR}"/ja2 -unittests || die -} - -pkg_postinst() { - if ! use cdinstall ; then - elog "You need to copy all files from the Data directory of" - elog "Jagged Alliance 2 installation to" - elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json" - elog "accordingly." - elog "Make sure the filenames are lowercase." - fi - - xdg_pkg_postinst -} diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild new file mode 100644 index 000000000000..28db1e673105 --- /dev/null +++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.17.0 + adler@1.0.2 + ahash@0.7.6 + aho-corasick@0.7.18 + ansi_term@0.11.0 + anyhow@1.0.69 + ascii@0.9.3 + atty@0.2.14 + autocfg@1.1.0 + backtrace@0.3.65 + base64@0.13.1 + bit-set@0.5.3 + bit-vec@0.6.3 + bitflags@1.3.2 + block-buffer@0.10.3 + bytecount@0.6.3 + byteorder@1.4.3 + bytes@1.4.0 + caseless@0.2.1 + cbindgen@0.20.0 + cc@1.0.73 + cesu8@1.1.0 + cfg-if@1.0.0 + clap@2.33.4 + combine@3.8.1 + combine@4.6.4 + crossbeam-channel@0.5.4 + crossbeam-deque@0.8.1 + crossbeam-epoch@0.9.8 + crossbeam-utils@0.8.8 + crypto-common@0.1.6 + cty@0.2.2 + deunicode@0.4.3 + digest@0.10.6 + dirs@4.0.0 + dirs-sys@0.3.7 + dunce@1.0.2 + either@1.6.1 + error-chain@0.12.4 + fancy-regex@0.8.0 + fastrand@1.7.0 + form_urlencoded@1.1.0 + fraction@0.10.0 + generic-array@0.14.5 + getopts@0.2.21 + getrandom@0.2.6 + gimli@0.26.1 + hashbrown@0.12.3 + heck@0.3.3 + hermit-abi@0.1.19 + hex@0.4.3 + idna@0.3.0 + indexmap@1.9.2 + instant@0.1.12 + iso8601@0.4.2 + itoa@1.0.1 + jni@0.14.0 + jni@0.19.0 + jni-sys@0.3.0 + json_comments@0.2.1 + jsonschema@0.16.0 + lazy_static@1.4.0 + libc@0.2.124 + lock_api@0.4.9 + log@0.4.16 + lru@0.8.1 + md-5@0.10.5 + memchr@2.4.1 + memoffset@0.6.5 + minimal-lexical@0.2.1 + miniz_oxide@0.5.1 + ndk@0.7.0 + ndk-sys@0.4.1+23.1.7779620 + nom@7.1.3 + num@0.2.1 + num-bigint@0.2.6 + num-cmp@0.1.0 + num-complex@0.2.4 + num-integer@0.1.45 + num-iter@0.1.43 + num-rational@0.2.4 + num-traits@0.2.15 + num_cpus@1.13.1 + num_enum@0.5.7 + num_enum_derive@0.5.7 + num_threads@0.1.6 + object@0.28.3 + once_cell@1.10.0 + parking_lot@0.12.1 + parking_lot_core@0.9.7 + percent-encoding@2.2.0 + proc-macro-crate@1.1.3 + proc-macro2@1.0.51 + quote@1.0.18 + raw-window-handle@0.5.0 + rayon@1.6.1 + rayon-core@1.10.2 + redox_syscall@0.2.13 + redox_users@0.4.3 + regex@1.7.1 + regex-syntax@0.6.28 + remove_dir_all@0.5.3 + rustc-demangle@0.1.21 + ryu@1.0.9 + same-file@1.0.6 + scopeguard@1.1.0 + send_wrapper@0.6.0 + serde@1.0.152 + serde_derive@1.0.152 + serde_json@1.0.93 + serde_yaml@0.9.17 + simplelog@0.12.0 + slug@0.1.4 + smallvec@1.10.0 + strsim@0.8.0 + syn@1.0.107 + tempfile@3.3.0 + termcolor@1.1.3 + textwrap@0.11.0 + thiserror@1.0.30 + thiserror-impl@1.0.30 + time@0.3.15 + time-macros@0.2.4 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + toml@0.5.9 + typenum@1.15.0 + unicode-bidi@0.3.10 + unicode-ident@1.0.6 + unicode-normalization@0.1.19 + unicode-segmentation@1.10.1 + unicode-width@0.1.9 + unreachable@1.0.0 + unsafe-libyaml@0.2.5 + url@2.3.1 + uuid@0.8.2 + vec_map@0.8.2 + version_check@0.9.4 + void@1.0.2 + walkdir@2.3.2 + wasi@0.10.2+wasi-snapshot-preview1 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.45.0 + windows-targets@0.42.1 + windows_aarch64_gnullvm@0.42.1 + windows_aarch64_msvc@0.42.1 + windows_i686_gnu@0.42.1 + windows_i686_msvc@0.42.1 + windows_x86_64_gnu@0.42.1 + windows_x86_64_gnullvm@0.42.1 + windows_x86_64_msvc@0.42.1 +" + +# See dependencies/lib-lua/CMakeLists.txt +LUA_COMPAT=( lua5-3 ) + +# proc_macro-span_shrink; update proc-macro2 crate +RUST_MAX_VER="1.71.1" + +inherit cargo cmake flag-o-matic lua-single xdg + +DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime" +HOMEPAGE="https://github.com/ja2-stracciatella/" +SRC_URI=" + https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz + editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf ) +" +SRC_URI+=" $(cargo_crate_uris ${CARGO_CRATES_URIS})" + +LICENSE="public-domain SFI-SCLA" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="cdinstall editor ru-gold test" +# ./ja2 -unittest can't find save files +RESTRICT="!test? ( test ) test" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +DEPEND=" + ${LUA_DEPS} + >=dev-cpp/magic_enum-0.9.5 + >=dev-cpp/sol2-3.3.0 + >=dev-cpp/string-theory-3.1 + >=dev-games/libsmacker-1.1.1 + >=dev-libs/miniaudio-0.11.11 + >=dev-libs/rapidjson-1.1.0 + media-libs/libsdl2[X,sound,video] +" +RDEPEND=" + ${DEPEND} + cdinstall? ( games-strategy/ja2-stracciatella-data ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.20.0-lua-cmake.patch +) + +pkg_setup() { + lua-single_pkg_setup + rust_pkg_setup +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/916965 + # https://github.com/ja2-stracciatella/ja2-stracciatella/issues/1963 + filter-lto + + local mycmakeargs=( + -DUSE_SCCACHE=OFF + + -DLOCAL_GTEST_LIB=OFF + -DLOCAL_FLTK_LIB=OFF + + -DLOCAL_LUA_LIB=OFF + -DLUA_VERSION="${ELUA#lua}" + + -DLOCAL_MAGICENUM_LIB=OFF + -DLOCAL_MINIAUDIO_LIB=OFF + -DLOCAL_RAPIDJSON_LIB=OFF + -DLOCAL_SDL_LIB=OFF + -DLOCAL_SOL_LIB=OFF + -DLOCAL_STRING_THEORY_LIB=OFF + + -DWITH_MAGICENUM=OFF + -DWITH_RUST_BINARIES=OFF + -DWITH_UNITTESTS=$(usex test) + + -DBUILD_LAUNCHER=OFF + + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + -DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2" + -DMINIAUDIO_INCLUDE_DIR="${EPREFIX}/usr/include/miniaudio" + -DMAGICENUM_INCLUDE_DIR="${EPREFIX}/usr/include" + ) + + cargo_gen_config + cmake_src_configure +} + +src_install() { + if use editor; then + insinto /usr/share/ja2 + doins "${DISTDIR}/${P}-editor.slf" + dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf" + fi + + cmake_src_install +} + +src_test() { + "${BUILD_DIR}"/ja2 -unittests || die +} + +pkg_postinst() { + if ! use cdinstall ; then + elog "You need to copy all files from the Data directory of" + elog "Jagged Alliance 2 installation to" + elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json" + elog "accordingly." + elog "Make sure the filenames are lowercase." + fi + + xdg_pkg_postinst +} -- cgit v1.2.3