diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile index 68f83f9b765a..84c1fcc1a8e3 100644 --- a/games/jaggedalliance2/Makefile +++ b/games/jaggedalliance2/Makefile @@ -1,154 +1,163 @@ # Created by: Christoph Mallon PORTNAME= ja2 DISTVERSIONPREFIX= v -DISTVERSION= 0.19.0 -PORTREVISION= 1 +DISTVERSION= 0.19.1 CATEGORIES= games MAINTAINER= timp87@gmail.com COMMENT= Port of "Jagged Alliance 2" using SDL LICENSE= PD SFI-SCLA LICENSE_COMB= multi LICENSE_NAME_SFI-SCLA= Strategy First Inc. Source Code License Agreement LICENSE_FILE_SFI-SCLA= ${WRKSRC}/SFI\ Source\ Code\ license\ agreement.txt LICENSE_PERMS_SFI-SCLA= dist-mirror no-dist-sell pkg-mirror no-pkg-sell \ auto-accept # Ignore this if you feel adventurous ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 powerpc64le ONLY_FOR_ARCHS_REASON= requires little endian environment BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \ rapidjson>=1.1.0:devel/rapidjson \ - sol2>=3.2.2:devel/sol2 + sol2>=3.2.2:devel/sol2 \ + miniaudio>=0.10.36<0.11:audio/miniaudio LIB_DEPENDS= libfltk.so:x11-toolkits/fltk USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53 USE_GITHUB= yes GH_ACCOUNT= ja2-stracciatella GH_PROJECT= ja2-stracciatella USE_SDL= sdl2 USE_GL= gl USE_XORG= ice sm x11 xext -GH_TUPLE= mackron:miniaudio:634cdb028f340075ae8e8a1126620695688d2ac3:miniaudio -CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" -CMAKE_OFF= LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB +CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" -DMINIAUDIO_INCLUDE_DIR="${PREFIX}/include/miniaudio" +CMAKE_OFF= LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB LOCAL_MINIAUDIO_LIB CARGO_CRATES= ahash-0.7.6 \ aho-corasick-0.7.18 \ ansi_term-0.11.0 \ atty-0.2.14 \ autocfg-1.1.0 \ bitflags-1.3.2 \ block-buffer-0.9.0 \ byteorder-1.4.3 \ caseless-0.2.1 \ cbindgen-0.20.0 \ cfg-if-1.0.0 \ chrono-0.4.19 \ clap-2.33.4 \ crossbeam-channel-0.5.4 \ crossbeam-deque-0.8.1 \ crossbeam-epoch-0.9.8 \ crossbeam-utils-0.8.8 \ deunicode-0.4.3 \ digest-0.9.0 \ dirs-4.0.0 \ dirs-sys-0.3.7 \ dunce-1.0.2 \ either-1.6.1 \ fastrand-1.7.0 \ generic-array-0.14.5 \ getopts-0.2.21 \ getrandom-0.2.6 \ hashbrown-0.11.2 \ heck-0.3.3 \ hermit-abi-0.1.19 \ hex-0.4.3 \ indexmap-1.8.1 \ instant-0.1.12 \ itoa-1.0.1 \ json_comments-0.2.1 \ lazy_static-1.4.0 \ libc-0.2.121 \ linked-hash-map-0.5.4 \ log-0.4.16 \ lru-0.7.5 \ md-5-0.9.1 \ memchr-2.4.1 \ memoffset-0.6.5 \ num-integer-0.1.44 \ num-traits-0.2.14 \ num_cpus-1.13.1 \ once_cell-1.10.0 \ opaque-debug-0.3.0 \ proc-macro2-1.0.37 \ quote-1.0.17 \ rayon-1.5.1 \ rayon-core-1.9.1 \ redox_syscall-0.2.13 \ redox_users-0.4.3 \ regex-1.5.5 \ regex-syntax-0.6.25 \ remove_dir_all-0.5.3 \ remove_dir_all-0.7.0 \ ryu-1.0.9 \ scopeguard-1.1.0 \ serde-1.0.136 \ serde_derive-1.0.136 \ serde_json-1.0.79 \ serde_yaml-0.8.23 \ simplelog-0.10.2 \ slug-0.1.4 \ strsim-0.8.0 \ syn-1.0.91 \ tempfile-3.3.0 \ termcolor-1.1.3 \ textwrap-0.11.0 \ thiserror-1.0.30 \ thiserror-impl-1.0.30 \ time-0.1.43 \ tinyvec-1.5.1 \ tinyvec_macros-0.1.0 \ toml-0.5.8 \ typenum-1.15.0 \ unicode-normalization-0.1.19 \ unicode-segmentation-1.9.0 \ unicode-width-0.1.9 \ unicode-xid-0.2.2 \ vec_map-0.8.2 \ version_check-0.9.4 \ 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 \ yaml-rust-0.4.5 CARGO_CARGOLOCK= ${WRKSRC}/rust/Cargo.lock CARGO_CARGOTOML= ${WRKSRC}/rust/Cargo.toml CARGO_BUILD= no CARGO_INSTALL= no CARGO_TEST= no MAKE_ENV= ${CARGO_ENV:NCARGO_TARGET_DIR=*} LDFLAGS+= -Wl,--as-needed -pre-patch: - @${REINPLACE_CMD} -e 's|https://github.com/mackron/miniaudio/archive/634cdb028f340075ae8e8a1126620695688d2ac3.zip|${DISTDIR}/mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz|' \ - -e 's|b30045e95cec65bfe1d9fe3639f480a2|975a4d15815118a7ded8fbc7d3de68f6|' \ - ${WRKSRC}/dependencies/lib-miniaudio/getter/CMakeLists.txt.in - post-patch: @${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \ ${WRKSRC}/rust/stracciatella/src/stracciatella.rs post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \ ${STAGEDIR}${PREFIX}/bin/ja2-launcher \ ${STAGEDIR}${PREFIX}/bin/ja2-resource-pack -.include +.include + +# Compilation with clang's broken in 14-CURRENT +.if ${OSVERSION} >= 1400000 +# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236344 +# Copy-pasted gcc-c++11-lib from Mk/Uses/compiler.mk +USE_GCC= yes +CHOSEN_COMPILER_TYPE= gcc +CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1 +LDFLAGS+= -L${WRKDIR} +_USES_configure+= 200:gcc-libc++-configure +gcc-libc++-configure: + @${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so +.endif + +.include diff --git a/games/jaggedalliance2/distinfo b/games/jaggedalliance2/distinfo index d3075c922bed..269e134dac07 100644 --- a/games/jaggedalliance2/distinfo +++ b/games/jaggedalliance2/distinfo @@ -1,185 +1,183 @@ -TIMESTAMP = 1650500685 +TIMESTAMP = 1651349655 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 SIZE (rust/crates/ahash-0.7.6.crate) = 38030 SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923 SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 SIZE (rust/crates/atty-0.2.14.crate) = 5470 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa SIZE (rust/crates/autocfg-1.1.0.crate) = 13272 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4 SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108 SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610 SIZE (rust/crates/byteorder-1.4.3.crate) = 22512 SHA256 (rust/crates/caseless-0.2.1.crate) = 808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f SIZE (rust/crates/caseless-0.2.1.crate) = 18826 SHA256 (rust/crates/cbindgen-0.20.0.crate) = 51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc SIZE (rust/crates/cbindgen-0.20.0.crate) = 183277 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73 SIZE (rust/crates/chrono-0.4.19.crate) = 155663 SHA256 (rust/crates/clap-2.33.4.crate) = 826bf7bc84f9435630275cb8e802a4a0ec792b615969934bd16d42ffed10f207 SIZE (rust/crates/clap-2.33.4.crate) = 202085 SHA256 (rust/crates/crossbeam-channel-0.5.4.crate) = 5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53 SIZE (rust/crates/crossbeam-channel-0.5.4.crate) = 88237 SHA256 (rust/crates/crossbeam-deque-0.8.1.crate) = 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e SIZE (rust/crates/crossbeam-deque-0.8.1.crate) = 20852 SHA256 (rust/crates/crossbeam-epoch-0.9.8.crate) = 1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c SIZE (rust/crates/crossbeam-epoch-0.9.8.crate) = 46012 SHA256 (rust/crates/crossbeam-utils-0.8.8.crate) = 0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38 SIZE (rust/crates/crossbeam-utils-0.8.8.crate) = 39681 SHA256 (rust/crates/deunicode-0.4.3.crate) = 850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690 SIZE (rust/crates/deunicode-0.4.3.crate) = 109535 SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066 SIZE (rust/crates/digest-0.9.0.crate) = 13247 SHA256 (rust/crates/dirs-4.0.0.crate) = ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059 SIZE (rust/crates/dirs-4.0.0.crate) = 12503 SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6 SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597 SHA256 (rust/crates/dunce-1.0.2.crate) = 453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541 SIZE (rust/crates/dunce-1.0.2.crate) = 7953 SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457 SIZE (rust/crates/either-1.6.1.crate) = 13641 SHA256 (rust/crates/fastrand-1.7.0.crate) = c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf SIZE (rust/crates/fastrand-1.7.0.crate) = 11265 SHA256 (rust/crates/generic-array-0.14.5.crate) = fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803 SIZE (rust/crates/generic-array-0.14.5.crate) = 28915 SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5 SIZE (rust/crates/getopts-0.2.21.crate) = 18457 SHA256 (rust/crates/getrandom-0.2.6.crate) = 9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad SIZE (rust/crates/getrandom-0.2.6.crate) = 28043 SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713 SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c SIZE (rust/crates/heck-0.3.3.crate) = 10260 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70 SIZE (rust/crates/hex-0.4.3.crate) = 13299 SHA256 (rust/crates/indexmap-1.8.1.crate) = 0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee SIZE (rust/crates/indexmap-1.8.1.crate) = 53220 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c SIZE (rust/crates/instant-0.1.12.crate) = 6128 SHA256 (rust/crates/itoa-1.0.1.crate) = 1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35 SIZE (rust/crates/itoa-1.0.1.crate) = 11059 SHA256 (rust/crates/json_comments-0.2.1.crate) = 41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5 SIZE (rust/crates/json_comments-0.2.1.crate) = 8169 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443 SHA256 (rust/crates/libc-0.2.121.crate) = efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f SIZE (rust/crates/libc-0.2.121.crate) = 574702 SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3 SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166 SHA256 (rust/crates/log-0.4.16.crate) = 6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8 SIZE (rust/crates/log-0.4.16.crate) = 37758 SHA256 (rust/crates/lru-0.7.5.crate) = 32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889 SIZE (rust/crates/lru-0.7.5.crate) = 12732 SHA256 (rust/crates/md-5-0.9.1.crate) = 7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15 SIZE (rust/crates/md-5-0.9.1.crate) = 15494 SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a SIZE (rust/crates/memchr-2.4.1.crate) = 64977 SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce SIZE (rust/crates/memoffset-0.6.5.crate) = 7686 SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db SIZE (rust/crates/num-integer-0.1.44.crate) = 22216 SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290 SIZE (rust/crates/num-traits-0.2.14.crate) = 45476 SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1 SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752 SHA256 (rust/crates/once_cell-1.10.0.crate) = 87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9 SIZE (rust/crates/once_cell-1.10.0.crate) = 30414 SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767 SHA256 (rust/crates/proc-macro2-1.0.37.crate) = ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1 SIZE (rust/crates/proc-macro2-1.0.37.crate) = 41378 SHA256 (rust/crates/quote-1.0.17.crate) = 632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58 SIZE (rust/crates/quote-1.0.17.crate) = 28629 SHA256 (rust/crates/rayon-1.5.1.crate) = c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90 SIZE (rust/crates/rayon-1.5.1.crate) = 160424 SHA256 (rust/crates/rayon-core-1.9.1.crate) = d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e SIZE (rust/crates/rayon-core-1.9.1.crate) = 64961 SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42 SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 SHA256 (rust/crates/regex-1.5.5.crate) = 1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286 SIZE (rust/crates/regex-1.5.5.crate) = 238119 SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293 SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7 SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184 SHA256 (rust/crates/remove_dir_all-0.7.0.crate) = 882f368737489ea543bc5c340e6f3d34a28c39980bd9a979e47322b26f60ac40 SIZE (rust/crates/remove_dir_all-0.7.0.crate) = 9041 SHA256 (rust/crates/ryu-1.0.9.crate) = 73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f SIZE (rust/crates/ryu-1.0.9.crate) = 48391 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789 SIZE (rust/crates/serde-1.0.136.crate) = 76158 SHA256 (rust/crates/serde_derive-1.0.136.crate) = 08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9 SIZE (rust/crates/serde_derive-1.0.136.crate) = 54776 SHA256 (rust/crates/serde_json-1.0.79.crate) = 8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95 SIZE (rust/crates/serde_json-1.0.79.crate) = 144451 SHA256 (rust/crates/serde_yaml-0.8.23.crate) = a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0 SIZE (rust/crates/serde_yaml-0.8.23.crate) = 42140 SHA256 (rust/crates/simplelog-0.10.2.crate) = 85d04ae642154220ef00ee82c36fb07853c10a4f2a0ca6719f9991211d2eb959 SIZE (rust/crates/simplelog-0.10.2.crate) = 17999 SHA256 (rust/crates/slug-0.1.4.crate) = b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373 SIZE (rust/crates/slug-0.1.4.crate) = 6640 SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a SIZE (rust/crates/strsim-0.8.0.crate) = 9309 SHA256 (rust/crates/syn-1.0.91.crate) = b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d SIZE (rust/crates/syn-1.0.91.crate) = 235996 SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4 SIZE (rust/crates/tempfile-3.3.0.crate) = 27578 SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755 SIZE (rust/crates/termcolor-1.1.3.crate) = 17242 SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 SIZE (rust/crates/textwrap-0.11.0.crate) = 17322 SHA256 (rust/crates/thiserror-1.0.30.crate) = 854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417 SIZE (rust/crates/thiserror-1.0.30.crate) = 17748 SHA256 (rust/crates/thiserror-impl-1.0.30.crate) = aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b SIZE (rust/crates/thiserror-impl-1.0.30.crate) = 15230 SHA256 (rust/crates/time-0.1.43.crate) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438 SIZE (rust/crates/time-0.1.43.crate) = 28653 SHA256 (rust/crates/tinyvec-1.5.1.crate) = 2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2 SIZE (rust/crates/tinyvec-1.5.1.crate) = 44942 SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817 SHA256 (rust/crates/toml-0.5.8.crate) = a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa SIZE (rust/crates/toml-0.5.8.crate) = 54219 SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987 SIZE (rust/crates/typenum-1.15.0.crate) = 40741 SHA256 (rust/crates/unicode-normalization-0.1.19.crate) = d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9 SIZE (rust/crates/unicode-normalization-0.1.19.crate) = 107353 SHA256 (rust/crates/unicode-segmentation-1.9.0.crate) = 7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99 SIZE (rust/crates/unicode-segmentation-1.9.0.crate) = 93241 SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973 SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745 SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3 SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955 SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f SIZE (rust/crates/version_check-0.9.4.crate) = 14895 SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6 SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815 SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85 SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783 -SHA256 (ja2-stracciatella-ja2-stracciatella-v0.19.0_GH0.tar.gz) = 8d204f2786b8e2cb8eca61005f89aae05e1ff2300079a61c15c1c61823dc037b -SIZE (ja2-stracciatella-ja2-stracciatella-v0.19.0_GH0.tar.gz) = 26386346 -SHA256 (mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz) = 4e21d471a09f644c6b6d0ee53f8df6d3019f1d2bc8b6dc3dc58a6ef3353b064e -SIZE (mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz) = 1227075 +SHA256 (ja2-stracciatella-ja2-stracciatella-v0.19.1_GH0.tar.gz) = e9806755f471275b653408f5b1ffc6f1629e83ac2fe04370b8756ed6eb87fee7 +SIZE (ja2-stracciatella-ja2-stracciatella-v0.19.1_GH0.tar.gz) = 26385836 diff --git a/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt b/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt index a11cdcdf6bdb..0ffaecc51d33 100644 --- a/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt +++ b/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt @@ -1,31 +1,24 @@ --- dependencies/lib-lua/CMakeLists.txt.orig 2021-04-23 09:23:24 UTC +++ dependencies/lib-lua/CMakeLists.txt @@ -1,4 +1,21 @@ # \file dependencies/lib-lua/CMakeLists.txt + +option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON) +if (NOT LOCAL_LUA_LIB) + message(STATUS "Using system Lua") + find_package(Lua "5.3" REQUIRED) + if (NOT LUA_FOUND) + message(FATAL_ERROR "Lua 5.3 not found") + endif() + + set(LUA_INCLUDE_DIRS "${LUA_INCLUDE_DIR}" PARENT_SCOPE) + + add_library(lua INTERFACE) + target_link_libraries(lua INTERFACE "${LUA_LIBRARY}") + + return() +endif() + message(STATUS "") CMAKE_MINIMUM_REQUIRED(VERSION 3.1) -@@ -31,4 +48,4 @@ LIST(REMOVE_ITEM LUA_SRC - "${SRC_DIR}/src/luac.c") - - ADD_LIBRARY(lua ${LUA_SRC}) --message(STATUS "") -\ No newline at end of file -+message(STATUS "") diff --git a/games/jaggedalliance2/files/patch-dependencies_lib-miniaudio_CMakeLists.txt b/games/jaggedalliance2/files/patch-dependencies_lib-miniaudio_CMakeLists.txt new file mode 100644 index 000000000000..9bf1647b5357 --- /dev/null +++ b/games/jaggedalliance2/files/patch-dependencies_lib-miniaudio_CMakeLists.txt @@ -0,0 +1,34 @@ +--- dependencies/lib-miniaudio/CMakeLists.txt.orig 2022-04-27 09:14:13 UTC ++++ dependencies/lib-miniaudio/CMakeLists.txt +@@ -1,5 +1,31 @@ + # \file dependencies/lib-miniaudio/CMakeLists.txt + ++option(LOCAL_MINIAUDIO_LIB "Download and build miniaudio instead of searching the system" ON) ++if (NOT LOCAL_MINIAUDIO_LIB) ++ message(STATUS "Using system miniaudio") ++ ++ if (NOT DEFINED MINIAUDIO_INCLUDE_DIR) ++ message(FATAL_ERROR "MINIAUDIO_INCLUDE_DIR var not set") ++ endif() ++ ++ include(CheckIncludeFileCXX) ++ set (CMAKE_REQUIRED_INCLUDES "${MINIAUDIO_INCLUDE_DIR}") ++ ++ CHECK_INCLUDE_FILE_CXX("miniaudio.h" MINIAUDIO_FOUND) ++ if (NOT MINIAUDIO_FOUND) ++ message(FATAL_ERROR "miniaudio.h not found") ++ endif() ++ ++ CHECK_INCLUDE_FILE_CXX("extras/stb_vorbis.c" VORBIS_FOUND) ++ if (NOT VORBIS_FOUND) ++ message(FATAL_ERROR "miniaudio extras/stb_vorbis.c not found") ++ endif() ++ ++ set(MINIAUDIO_INCLUDE_DIRS "${MINIAUDIO_INCLUDE_DIR}" PARENT_SCOPE) ++ ++ return() ++endif() ++ + message(STATUS "") + + # create getter diff --git a/games/jaggedalliance2/files/patch-rust_stracciatella_src_fs.rs b/games/jaggedalliance2/files/patch-rust_stracciatella_src_fs.rs new file mode 100644 index 000000000000..1fdc729750d8 --- /dev/null +++ b/games/jaggedalliance2/files/patch-rust_stracciatella_src_fs.rs @@ -0,0 +1,11 @@ +--- rust/stracciatella/src/fs.rs.orig 2022-05-02 13:31:34 UTC ++++ rust/stracciatella/src/fs.rs +@@ -59,7 +59,7 @@ pub fn remove_file>(path: P) -> Result< + pub fn rename>(from: P, to: P) -> Result<(), io::Error> { + match std::fs::rename(&from, &to) { + Ok(()) => Ok(()), +- #[cfg(target_os = "linux")] ++ #[cfg(target_family = "unix")] + Err(e) if e.raw_os_error() == Some(libc::EXDEV) => { + std::fs::copy(&from, &to).and_then(|_| remove_file(&from)) + } diff --git a/games/jaggedalliance2/files/patch-src_sgp_SoundMan.cc b/games/jaggedalliance2/files/patch-src_sgp_SoundMan.cc new file mode 100644 index 000000000000..a36ac1994f55 --- /dev/null +++ b/games/jaggedalliance2/files/patch-src_sgp_SoundMan.cc @@ -0,0 +1,11 @@ +--- src/sgp/SoundMan.cc.orig 2022-04-27 09:14:13 UTC ++++ src/sgp/SoundMan.cc +@@ -696,7 +696,7 @@ size_t MiniaudioReadProc(ma_decoder* pDecoder, void* p + return SDL_RWread(rwOps, pBufferOut, sizeof(UINT8), bytesToRead); + } + +-ma_bool32 MiniaudioSeekProc(ma_decoder* pDecoder, int byteOffset, ma_seek_origin origin) { ++ma_bool32 MiniaudioSeekProc(ma_decoder* pDecoder, ma_int64 byteOffset, ma_seek_origin origin) { + auto rwOps = (SDL_RWops*)pDecoder->pUserData; + auto sdlOrigin = RW_SEEK_SET; + if (origin == ma_seek_origin::ma_seek_origin_current) {