Attachment #239755 for bug #269122




PORTNAME=	ja2
DISTVERSIONPREFIX=	v
DISTVERSION=	0.20.0
PORTREVISION=	7
CATEGORIES=	games

MAINTAINER=	timp87@gmail.com

BUILD_DEPENDS=	string_theory>=3.1:devel/string_theory \
		rapidjson>=1.1.0:devel/rapidjson \
		sol2>=3.2.2:devel/sol2 \
		miniaudio>=0.11.9:audio/miniaudio
LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk

USES=		cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53

USE_SDL=	sdl2
USE_GL=		gl
USE_XORG=	ice sm x11 xext
GH_TUPLE=	Neargye:magic_enum:v0.7.3:magic_enum

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=	addr2line-0.17.0 \
		adler-1.0.2 \
		ahash-0.7.6 \
		aho-corasick-0.7.18 \
		ansi_term-0.11.0 \
		ascii-0.9.3 \
		atty-0.2.14 \
		autocfg-1.1.0 \
		backtrace-0.3.65 \
		bitflags-1.3.2 \
		block-buffer-0.9.0 \
		byteorder-1.4.3 \
		bytes-1.1.0 \
		caseless-0.2.1 \
		cbindgen-0.20.0 \
		cc-1.0.73 \
		cesu8-1.1.0 \
		cfg-if-1.0.0 \
		chrono-0.4.19 \
		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 \

		dirs-sys-0.3.7 \
		dunce-1.0.2 \
		either-1.6.1 \
		env_logger-0.8.4 \
		error-chain-0.12.4 \
		fastrand-1.7.0 \
		generic-array-0.14.5 \
		getopts-0.2.21 \
		getrandom-0.2.6 \
		gimli-0.26.1 \
		hashbrown-0.11.2 \
		heck-0.3.3 \
		hermit-abi-0.1.19 \

		itoa-1.0.1 \
		json_comments-0.2.1 \
		lazy_static-1.4.0 \
		libc-0.2.124 \
		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 \
		miniz_oxide-0.5.1 \
		num-integer-0.1.44 \
		num-traits-0.2.14 \
		num_cpus-1.13.1 \
		num_enum-0.5.7 \
		num_enum_derive-0.5.7 \
		object-0.28.3 \
		once_cell-1.10.0 \
		opaque-debug-0.3.0 \
		proc-macro-crate-1.1.3 \
		proc-macro2-1.0.37 \
		quote-1.0.18 \
		rayon-1.5.2 \
		rayon-core-1.9.2 \
		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 \
		rustc-demangle-0.1.21 \
		ryu-1.0.9 \
		same-file-1.0.6 \
		scopeguard-1.1.0 \
		serde-1.0.136 \
		serde_derive-1.0.136 \

		thiserror-1.0.30 \
		thiserror-impl-1.0.30 \
		time-0.1.43 \
		tinyvec-1.6.0 \
		tinyvec_macros-0.1.0 \
		toml-0.5.9 \
		typenum-1.15.0 \
		unicode-normalization-0.1.19 \
		unicode-segmentation-1.9.0 \
		unicode-width-0.1.9 \
		unicode-xid-0.2.2 \
		unreachable-1.0.0 \
		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 \

MAKE_ENV=	${CARGO_ENV:NCARGO_TARGET_DIR=*}
LDFLAGS+=	-Wl,--as-needed

pre-patch:
	@${REINPLACE_CMD} -e 's|https://github.com/Neargye/magic_enum/archive/v0.7.3.zip|${DISTDIR}/Neargye-magic_enum-v0.7.3_GH0.tar.gz|' \
		-e 's|86338841251da1bacab82684a76c4042|fc20f4149a6d6a2caa8ff66f99dac7cf|' \
		${WRKSRC}/dependencies/lib-magic_enum/getter/CMakeLists.txt.in

post-patch:
	@${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \
		${WRKSRC}/rust/stracciatella/src/config/ja2_json.rs \
		${WRKSRC}/rust/stracciatella/src/config/engine_options.rs

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \

Lines 1-30 Link Here

(-)b/games/jaggedalliance2/distinfo (-15 / +61 lines)
1	TIMESTAMP = 1651349655	1	TIMESTAMP = 1674509362
		2	SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
		3	SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
		4	SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
		5	SIZE (rust/crates/adler-1.0.2.crate) = 12778
2	SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47	6	SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47
3	SIZE (rust/crates/ahash-0.7.6.crate) = 38030	7	SIZE (rust/crates/ahash-0.7.6.crate) = 38030
4	SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f	8	SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
5	SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923	9	SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
6	SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b	10	SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
7	SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087	11	SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
		12	SHA256 (rust/crates/ascii-0.9.3.crate) = eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e
		13	SIZE (rust/crates/ascii-0.9.3.crate) = 28283
8	SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8	14	SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
9	SIZE (rust/crates/atty-0.2.14.crate) = 5470	15	SIZE (rust/crates/atty-0.2.14.crate) = 5470
10	SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa	16	SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
11	SIZE (rust/crates/autocfg-1.1.0.crate) = 13272	17	SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
		18	SHA256 (rust/crates/backtrace-0.3.65.crate) = 11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61
		19	SIZE (rust/crates/backtrace-0.3.65.crate) = 74129
12	SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a	20	SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
13	SIZE (rust/crates/bitflags-1.3.2.crate) = 23021	21	SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
14	SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4	22	SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
15	SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108	23	SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
16	SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610	24	SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
17	SIZE (rust/crates/byteorder-1.4.3.crate) = 22512	25	SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
		26	SHA256 (rust/crates/bytes-1.1.0.crate) = c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8
		27	SIZE (rust/crates/bytes-1.1.0.crate) = 49640
18	SHA256 (rust/crates/caseless-0.2.1.crate) = 808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f	28	SHA256 (rust/crates/caseless-0.2.1.crate) = 808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f
19	SIZE (rust/crates/caseless-0.2.1.crate) = 18826	29	SIZE (rust/crates/caseless-0.2.1.crate) = 18826
20	SHA256 (rust/crates/cbindgen-0.20.0.crate) = 51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc	30	SHA256 (rust/crates/cbindgen-0.20.0.crate) = 51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc
21	SIZE (rust/crates/cbindgen-0.20.0.crate) = 183277	31	SIZE (rust/crates/cbindgen-0.20.0.crate) = 183277
		32	SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11
		33	SIZE (rust/crates/cc-1.0.73.crate) = 57880
		34	SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
		35	SIZE (rust/crates/cesu8-1.1.0.crate) = 10555
22	SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd	36	SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
23	SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934	37	SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
24	SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73	38	SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73
25	SIZE (rust/crates/chrono-0.4.19.crate) = 155663	39	SIZE (rust/crates/chrono-0.4.19.crate) = 155663
26	SHA256 (rust/crates/clap-2.33.4.crate) = 826bf7bc84f9435630275cb8e802a4a0ec792b615969934bd16d42ffed10f207	40	SHA256 (rust/crates/clap-2.33.4.crate) = 826bf7bc84f9435630275cb8e802a4a0ec792b615969934bd16d42ffed10f207
27	SIZE (rust/crates/clap-2.33.4.crate) = 202085	41	SIZE (rust/crates/clap-2.33.4.crate) = 202085
		42	SHA256 (rust/crates/combine-3.8.1.crate) = da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680
		43	SIZE (rust/crates/combine-3.8.1.crate) = 103773
		44	SHA256 (rust/crates/combine-4.6.4.crate) = 2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948
		45	SIZE (rust/crates/combine-4.6.4.crate) = 132144
28	SHA256 (rust/crates/crossbeam-channel-0.5.4.crate) = 5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53	46	SHA256 (rust/crates/crossbeam-channel-0.5.4.crate) = 5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53
29	SIZE (rust/crates/crossbeam-channel-0.5.4.crate) = 88237	47	SIZE (rust/crates/crossbeam-channel-0.5.4.crate) = 88237
30	SHA256 (rust/crates/crossbeam-deque-0.8.1.crate) = 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e	48	SHA256 (rust/crates/crossbeam-deque-0.8.1.crate) = 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e
Lines 45-50 SHA256 (rust/crates/dunce-1.0.2.crate) = 453440c271cf5577fd2a40e4942540cb7d0d2f8 Link Here
45	SIZE (rust/crates/dunce-1.0.2.crate) = 7953	63	SIZE (rust/crates/dunce-1.0.2.crate) = 7953
46	SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457	64	SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
47	SIZE (rust/crates/either-1.6.1.crate) = 13641	65	SIZE (rust/crates/either-1.6.1.crate) = 13641
		66	SHA256 (rust/crates/env_logger-0.8.4.crate) = a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3
		67	SIZE (rust/crates/env_logger-0.8.4.crate) = 33342
		68	SHA256 (rust/crates/error-chain-0.12.4.crate) = 2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc
		69	SIZE (rust/crates/error-chain-0.12.4.crate) = 29274
48	SHA256 (rust/crates/fastrand-1.7.0.crate) = c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf	70	SHA256 (rust/crates/fastrand-1.7.0.crate) = c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf
49	SIZE (rust/crates/fastrand-1.7.0.crate) = 11265	71	SIZE (rust/crates/fastrand-1.7.0.crate) = 11265
50	SHA256 (rust/crates/generic-array-0.14.5.crate) = fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803	72	SHA256 (rust/crates/generic-array-0.14.5.crate) = fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803
Lines 53-58 SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce8 Link Here
53	SIZE (rust/crates/getopts-0.2.21.crate) = 18457	75	SIZE (rust/crates/getopts-0.2.21.crate) = 18457
54	SHA256 (rust/crates/getrandom-0.2.6.crate) = 9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad	76	SHA256 (rust/crates/getrandom-0.2.6.crate) = 9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad
55	SIZE (rust/crates/getrandom-0.2.6.crate) = 28043	77	SIZE (rust/crates/getrandom-0.2.6.crate) = 28043
		78	SHA256 (rust/crates/gimli-0.26.1.crate) = 78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4
		79	SIZE (rust/crates/gimli-0.26.1.crate) = 716168
56	SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e	80	SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
57	SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713	81	SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
58	SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c	82	SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c
Lines 71-78 SHA256 (rust/crates/json_comments-0.2.1.crate) = 41ee439ee368ba4a77ac70d04f14015 Link Here
71	SIZE (rust/crates/json_comments-0.2.1.crate) = 8169	95	SIZE (rust/crates/json_comments-0.2.1.crate) = 8169
72	SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646	96	SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
73	SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443	97	SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
74	SHA256 (rust/crates/libc-0.2.121.crate) = efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f	98	SHA256 (rust/crates/libc-0.2.124.crate) = 21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50
75	SIZE (rust/crates/libc-0.2.121.crate) = 574702	99	SIZE (rust/crates/libc-0.2.124.crate) = 577742
76	SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3	100	SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3
77	SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166	101	SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166
78	SHA256 (rust/crates/log-0.4.16.crate) = 6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8	102	SHA256 (rust/crates/log-0.4.16.crate) = 6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8
Lines 85-108 SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f Link Here
85	SIZE (rust/crates/memchr-2.4.1.crate) = 64977	109	SIZE (rust/crates/memchr-2.4.1.crate) = 64977
86	SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce	110	SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
87	SIZE (rust/crates/memoffset-0.6.5.crate) = 7686	111	SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
		112	SHA256 (rust/crates/miniz_oxide-0.5.1.crate) = d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082
		113	SIZE (rust/crates/miniz_oxide-0.5.1.crate) = 52418
88	SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db	114	SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
89	SIZE (rust/crates/num-integer-0.1.44.crate) = 22216	115	SIZE (rust/crates/num-integer-0.1.44.crate) = 22216
90	SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290	116	SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
91	SIZE (rust/crates/num-traits-0.2.14.crate) = 45476	117	SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
92	SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1	118	SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1
93	SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752	119	SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752
		120	SHA256 (rust/crates/num_enum-0.5.7.crate) = cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9
		121	SIZE (rust/crates/num_enum-0.5.7.crate) = 15199
		122	SHA256 (rust/crates/num_enum_derive-0.5.7.crate) = 3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce
		123	SIZE (rust/crates/num_enum_derive-0.5.7.crate) = 12225
		124	SHA256 (rust/crates/object-0.28.3.crate) = 40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456
		125	SIZE (rust/crates/object-0.28.3.crate) = 233545
94	SHA256 (rust/crates/once_cell-1.10.0.crate) = 87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9	126	SHA256 (rust/crates/once_cell-1.10.0.crate) = 87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9
95	SIZE (rust/crates/once_cell-1.10.0.crate) = 30414	127	SIZE (rust/crates/once_cell-1.10.0.crate) = 30414
96	SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5	128	SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
97	SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767	129	SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
		130	SHA256 (rust/crates/proc-macro-crate-1.1.3.crate) = e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a
		131	SIZE (rust/crates/proc-macro-crate-1.1.3.crate) = 8758
98	SHA256 (rust/crates/proc-macro2-1.0.37.crate) = ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1	132	SHA256 (rust/crates/proc-macro2-1.0.37.crate) = ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1
99	SIZE (rust/crates/proc-macro2-1.0.37.crate) = 41378	133	SIZE (rust/crates/proc-macro2-1.0.37.crate) = 41378
100	SHA256 (rust/crates/quote-1.0.17.crate) = 632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58	134	SHA256 (rust/crates/quote-1.0.18.crate) = a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1
101	SIZE (rust/crates/quote-1.0.17.crate) = 28629	135	SIZE (rust/crates/quote-1.0.18.crate) = 28911
102	SHA256 (rust/crates/rayon-1.5.1.crate) = c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90	136	SHA256 (rust/crates/rayon-1.5.2.crate) = fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221
103	SIZE (rust/crates/rayon-1.5.1.crate) = 160424	137	SIZE (rust/crates/rayon-1.5.2.crate) = 165456
104	SHA256 (rust/crates/rayon-core-1.9.1.crate) = d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e	138	SHA256 (rust/crates/rayon-core-1.9.2.crate) = 9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4
105	SIZE (rust/crates/rayon-core-1.9.1.crate) = 64961	139	SIZE (rust/crates/rayon-core-1.9.2.crate) = 65221
106	SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42	140	SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42
107	SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759	141	SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759
108	SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b	142	SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b
Lines 115-122 SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df8 Link Here
115	SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184	149	SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
116	SHA256 (rust/crates/remove_dir_all-0.7.0.crate) = 882f368737489ea543bc5c340e6f3d34a28c39980bd9a979e47322b26f60ac40	150	SHA256 (rust/crates/remove_dir_all-0.7.0.crate) = 882f368737489ea543bc5c340e6f3d34a28c39980bd9a979e47322b26f60ac40
117	SIZE (rust/crates/remove_dir_all-0.7.0.crate) = 9041	151	SIZE (rust/crates/remove_dir_all-0.7.0.crate) = 9041
		152	SHA256 (rust/crates/rustc-demangle-0.1.21.crate) = 7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342
		153	SIZE (rust/crates/rustc-demangle-0.1.21.crate) = 27920
118	SHA256 (rust/crates/ryu-1.0.9.crate) = 73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f	154	SHA256 (rust/crates/ryu-1.0.9.crate) = 73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f
119	SIZE (rust/crates/ryu-1.0.9.crate) = 48391	155	SIZE (rust/crates/ryu-1.0.9.crate) = 48391
		156	SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
		157	SIZE (rust/crates/same-file-1.0.6.crate) = 10183
120	SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd	158	SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
121	SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470	159	SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
122	SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789	160	SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789
Lines 147-158 SHA256 (rust/crates/thiserror-impl-1.0.30.crate) = aa32fd3f627f367fe16f893e2597a Link Here
147	SIZE (rust/crates/thiserror-impl-1.0.30.crate) = 15230	185	SIZE (rust/crates/thiserror-impl-1.0.30.crate) = 15230
148	SHA256 (rust/crates/time-0.1.43.crate) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438	186	SHA256 (rust/crates/time-0.1.43.crate) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438
149	SIZE (rust/crates/time-0.1.43.crate) = 28653	187	SIZE (rust/crates/time-0.1.43.crate) = 28653
150	SHA256 (rust/crates/tinyvec-1.5.1.crate) = 2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2	188	SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
151	SIZE (rust/crates/tinyvec-1.5.1.crate) = 44942	189	SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
152	SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c	190	SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
153	SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817	191	SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
154	SHA256 (rust/crates/toml-0.5.8.crate) = a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa	192	SHA256 (rust/crates/toml-0.5.9.crate) = 8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7
155	SIZE (rust/crates/toml-0.5.8.crate) = 54219	193	SIZE (rust/crates/toml-0.5.9.crate) = 55667
156	SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987	194	SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987
157	SIZE (rust/crates/typenum-1.15.0.crate) = 40741	195	SIZE (rust/crates/typenum-1.15.0.crate) = 40741
158	SHA256 (rust/crates/unicode-normalization-0.1.19.crate) = d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9	196	SHA256 (rust/crates/unicode-normalization-0.1.19.crate) = d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9
Lines 163-172 SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aa Link Here
163	SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745	201	SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745
164	SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3	202	SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
165	SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955	203	SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
		204	SHA256 (rust/crates/unreachable-1.0.0.crate) = 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56
		205	SIZE (rust/crates/unreachable-1.0.0.crate) = 6355
166	SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191	206	SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
167	SIZE (rust/crates/vec_map-0.8.2.crate) = 14466	207	SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
168	SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f	208	SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
169	SIZE (rust/crates/version_check-0.9.4.crate) = 14895	209	SIZE (rust/crates/version_check-0.9.4.crate) = 14895
		210	SHA256 (rust/crates/void-1.0.2.crate) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d
		211	SIZE (rust/crates/void-1.0.2.crate) = 2356
		212	SHA256 (rust/crates/walkdir-2.3.2.crate) = 808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56
		213	SIZE (rust/crates/walkdir-2.3.2.crate) = 23516
170	SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6	214	SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
171	SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505	215	SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
172	SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419	216	SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
Lines 179-183 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1 Link Here
179	SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998	223	SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
180	SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85	224	SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
181	SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783	225	SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
182	SHA256 (ja2-stracciatella-ja2-stracciatella-v0.19.1_GH0.tar.gz) = e9806755f471275b653408f5b1ffc6f1629e83ac2fe04370b8756ed6eb87fee7	226	SHA256 (ja2-stracciatella-ja2-stracciatella-v0.20.0_GH0.tar.gz) = 432e8c834ce5c5aaa2be3e10e44c47963970936ede39c33c95e7d8f874770ff8
183	SIZE (ja2-stracciatella-ja2-stracciatella-v0.19.1_GH0.tar.gz) = 26385836	227	SIZE (ja2-stracciatella-ja2-stracciatella-v0.20.0_GH0.tar.gz) = 32931298
		228	SHA256 (Neargye-magic_enum-v0.7.3_GH0.tar.gz) = b8d0cd848546fee136dc1fa4bb021a1e4dc8fe98e44d8c119faa3ef387636bf7
		229	SIZE (Neargye-magic_enum-v0.7.3_GH0.tar.gz) = 151870

Removed Link Here

(-)a/games/jaggedalliance2/files/patch-CMakeLists.txt (-11 lines)
1	--- CMakeLists.txt.orig 2022-04-14 10:20:57 UTC
2	+++ CMakeLists.txt
3	@@ -94,6 +94,8 @@ option(WITH_MAEMO "Build with right click mapped to F4
4	option(BUILD_LAUNCHER "Build the ja2 launcher application" ON)
5	option(WITH_EDITOR_SLF "Include the latest free editor.slf" OFF)
6	option(WITH_RUST_BINARIES "Include rust binaries in build" ON)
7	+# @see LOCAL_LUA_LIB in dependencies/lib-lua/CMakeLists.txt
8	+# @see LOCAL_SOL_LIB in dependencies/lib-sol2/CMakeLists.txt
9	set(WITH_CUSTOM_LOCALE "" CACHE STRING "Set a custom locale at the start, leave empty to disable")
10
11	if(MSVC)




--- dependencies/lib-lua/CMakeLists.txt.orig	2023-01-25 17:13:43 UTC
+++ dependencies/lib-lua/CMakeLists.txt
@@ -3,7 +3,7 @@
 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)
+    find_package(Lua "5.3" REQUIRED EXACT)
     if (NOT LUA_FOUND)
         message(FATAL_ERROR "Lua 5.3 not found")
     endif()
+    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 "<lua>")
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.1)




--- 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 "<miniaudio>")
 
 # create getter




--- dependencies/lib-sol2/CMakeLists.txt.orig	2021-04-23 09:23:24 UTC
+++ dependencies/lib-sol2/CMakeLists.txt
@@ -1,5 +1,20 @@
 # \file dependencies/lib-sol2/CMakeLists.txt
 
+option(LOCAL_SOL_LIB "Download and build Sol2 instead of searching the system" ON)
+if (NOT LOCAL_SOL_LIB)
+    message(STATUS "Using system Sol2")
+    find_package(sol2 "3.2.2"
+        REQUIRED
+        PATH_SUFFIXES lib/cmake/sol2 # path to sol2-config.cmake
+    )
+    if (NOT sol2_FOUND)
+        message(FATAL_ERROR "Sol2 not found")
+    endif()
+
+    set(SOL_INCLUDE_DIR "${SOL2_INCLUDE_DIRS}" PARENT_SCOPE)
+    return()
+endif()
+
 message(STATUS "<sol2>")
 
 # create getter

Lines 1-6 Link Here

(-)b/games/jaggedalliance2/files/patch-rust_stracciatella_Cargo.toml (-5 / +7 lines)
1	--- rust/stracciatella/Cargo.toml.orig 2022-04-14 10:20:57 UTC	1	--- rust/stracciatella/Cargo.toml.orig 2022-11-11 20:19:16 UTC
2	+++ rust/stracciatella/Cargo.toml	2	+++ rust/stracciatella/Cargo.toml
3	@@ -36,24 +36,6 @@ slug = "0.1.4"	3	@@ -37,26 +37,6 @@ slug = "0.1.4"
4	[target.'cfg(not(target_os = "android"))'.dependencies.simplelog]	4	[target.'cfg(not(target_os = "android"))'.dependencies.simplelog]
5	version = "0.10"	5	version = "0.10"
6		6
Lines 16-26 Link Here
16	-[target.'cfg(target_os = "android")'.dependencies.lazy_static]	16	-[target.'cfg(target_os = "android")'.dependencies.lazy_static]
17	-version = "1.4"	17	-version = "1.4"
18	-[target.'cfg(target_os = "android")'.dependencies.jni]	18	-[target.'cfg(target_os = "android")'.dependencies.jni]
19	-version = "0.14"	19	-version = "0.18"
		20	-[target.'cfg(target_os = "android")'.dependencies.jni-sys]
		21	-version = "0.3"
20	-[target.'cfg(target_os = "android")'.dependencies.ndk]	22	-[target.'cfg(target_os = "android")'.dependencies.ndk]
21	-git = "https://github.com/selaux/android-ndk-rs"	23	-version = "0.6"
22	-[target.'cfg(target_os = "android")'.dependencies.ndk-sys]	24	-[target.'cfg(target_os = "android")'.dependencies.ndk-sys]
23	-git = "https://github.com/selaux/android-ndk-rs"	25	-version = "0.3"
24	-	26	-
25	[build-dependencies]	27	[build-dependencies]
26	serde = "1.0"	28	serde = "1.0"

Removed Link Here

(-)a/games/jaggedalliance2/files/patch-rust_stracciatella_src_fs.rs (-11 lines)
1	--- rust/stracciatella/src/fs.rs.orig 2022-05-02 13:31:34 UTC
2	+++ rust/stracciatella/src/fs.rs
3	@@ -59,7 +59,7 @@ pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<
4	pub fn rename<P: AsRef<Path>>(from: P, to: P) -> Result<(), io::Error> {
5	match std::fs::rename(&from, &to) {
6	Ok(()) => Ok(()),
7	- #[cfg(target_os = "linux")]
8	+ #[cfg(target_family = "unix")]
9	Err(e) if e.raw_os_error() == Some(libc::EXDEV) => {
10	std::fs::copy(&from, &to).and_then(\|_\| remove_file(&from))
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) {
- 

Return to bug 269122

Lines 1-7 Link Here

(-)b/games/jaggedalliance2/Makefile (-11 / +39 lines)
1	PORTNAME= ja2	1	PORTNAME= ja2
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.19.1	3	DISTVERSION= 0.20.0
4	PORTREVISION= 7
5	CATEGORIES= games	4	CATEGORIES= games
6		5
7	MAINTAINER= timp87@gmail.com	6	MAINTAINER= timp87@gmail.com
Lines 22-28 ONLY_FOR_ARCHS_REASON= requires little endian environment Link Here
22	BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \	21	BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \
23	rapidjson>=1.1.0:devel/rapidjson \	22	rapidjson>=1.1.0:devel/rapidjson \
24	sol2>=3.2.2:devel/sol2 \	23	sol2>=3.2.2:devel/sol2 \
25	miniaudio>=0.10.36,1<0.11,1:audio/miniaudio	24	miniaudio>=0.11.9:audio/miniaudio
26	LIB_DEPENDS= libfltk.so:x11-toolkits/fltk	25	LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
27		26
28	USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53	27	USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53
Lines 32-54 GH_PROJECT= ja2-stracciatella Link Here
32	USE_SDL= sdl2	31	USE_SDL= sdl2
33	USE_GL= gl	32	USE_GL= gl
34	USE_XORG= ice sm x11 xext	33	USE_XORG= ice sm x11 xext
		34	GH_TUPLE= Neargye:magic_enum:v0.7.3:magic_enum
35		35
36	CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" -DMINIAUDIO_INCLUDE_DIR="${PREFIX}/include/miniaudio"	36	CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" -DMINIAUDIO_INCLUDE_DIR="${PREFIX}/include/miniaudio"
37	CMAKE_OFF= LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB LOCAL_MINIAUDIO_LIB	37	CMAKE_OFF= LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB LOCAL_MINIAUDIO_LIB
38		38
39	CARGO_CRATES= ahash-0.7.6 \	39	CARGO_CRATES= addr2line-0.17.0 \
		40	adler-1.0.2 \
		41	ahash-0.7.6 \
40	aho-corasick-0.7.18 \	42	aho-corasick-0.7.18 \
41	ansi_term-0.11.0 \	43	ansi_term-0.11.0 \
		44	ascii-0.9.3 \
42	atty-0.2.14 \	45	atty-0.2.14 \
43	autocfg-1.1.0 \	46	autocfg-1.1.0 \
		47	backtrace-0.3.65 \
44	bitflags-1.3.2 \	48	bitflags-1.3.2 \
45	block-buffer-0.9.0 \	49	block-buffer-0.9.0 \
46	byteorder-1.4.3 \	50	byteorder-1.4.3 \
		51	bytes-1.1.0 \
47	caseless-0.2.1 \	52	caseless-0.2.1 \
48	cbindgen-0.20.0 \	53	cbindgen-0.20.0 \
		54	cc-1.0.73 \
		55	cesu8-1.1.0 \
49	cfg-if-1.0.0 \	56	cfg-if-1.0.0 \
50	chrono-0.4.19 \	57	chrono-0.4.19 \
51	clap-2.33.4 \	58	clap-2.33.4 \
		59	combine-3.8.1 \
		60	combine-4.6.4 \
52	crossbeam-channel-0.5.4 \	61	crossbeam-channel-0.5.4 \
53	crossbeam-deque-0.8.1 \	62	crossbeam-deque-0.8.1 \
54	crossbeam-epoch-0.9.8 \	63	crossbeam-epoch-0.9.8 \
Lines 59-68 CARGO_CRATES= ahash-0.7.6 \ Link Here
59	dirs-sys-0.3.7 \	68	dirs-sys-0.3.7 \
60	dunce-1.0.2 \	69	dunce-1.0.2 \
61	either-1.6.1 \	70	either-1.6.1 \
		71	env_logger-0.8.4 \
		72	error-chain-0.12.4 \
62	fastrand-1.7.0 \	73	fastrand-1.7.0 \
63	generic-array-0.14.5 \	74	generic-array-0.14.5 \
64	getopts-0.2.21 \	75	getopts-0.2.21 \
65	getrandom-0.2.6 \	76	getrandom-0.2.6 \
		77	gimli-0.26.1 \
66	hashbrown-0.11.2 \	78	hashbrown-0.11.2 \
67	heck-0.3.3 \	79	heck-0.3.3 \
68	hermit-abi-0.1.19 \	80	hermit-abi-0.1.19 \
Lines 72-100 CARGO_CRATES= ahash-0.7.6 \ Link Here
72	itoa-1.0.1 \	84	itoa-1.0.1 \
73	json_comments-0.2.1 \	85	json_comments-0.2.1 \
74	lazy_static-1.4.0 \	86	lazy_static-1.4.0 \
75	libc-0.2.121 \	87	libc-0.2.124 \
76	linked-hash-map-0.5.4 \	88	linked-hash-map-0.5.4 \
77	log-0.4.16 \	89	log-0.4.16 \
78	lru-0.7.5 \	90	lru-0.7.5 \
79	md-5-0.9.1 \	91	md-5-0.9.1 \
80	memchr-2.4.1 \	92	memchr-2.4.1 \
81	memoffset-0.6.5 \	93	memoffset-0.6.5 \
		94	miniz_oxide-0.5.1 \
82	num-integer-0.1.44 \	95	num-integer-0.1.44 \
83	num-traits-0.2.14 \	96	num-traits-0.2.14 \
84	num_cpus-1.13.1 \	97	num_cpus-1.13.1 \
		98	num_enum-0.5.7 \
		99	num_enum_derive-0.5.7 \
		100	object-0.28.3 \
85	once_cell-1.10.0 \	101	once_cell-1.10.0 \
86	opaque-debug-0.3.0 \	102	opaque-debug-0.3.0 \
		103	proc-macro-crate-1.1.3 \
87	proc-macro2-1.0.37 \	104	proc-macro2-1.0.37 \
88	quote-1.0.17 \	105	quote-1.0.18 \
89	rayon-1.5.1 \	106	rayon-1.5.2 \
90	rayon-core-1.9.1 \	107	rayon-core-1.9.2 \
91	redox_syscall-0.2.13 \	108	redox_syscall-0.2.13 \
92	redox_users-0.4.3 \	109	redox_users-0.4.3 \
93	regex-1.5.5 \	110	regex-1.5.5 \
94	regex-syntax-0.6.25 \	111	regex-syntax-0.6.25 \
95	remove_dir_all-0.5.3 \	112	remove_dir_all-0.5.3 \
96	remove_dir_all-0.7.0 \	113	remove_dir_all-0.7.0 \
		114	rustc-demangle-0.1.21 \
97	ryu-1.0.9 \	115	ryu-1.0.9 \
		116	same-file-1.0.6 \
98	scopeguard-1.1.0 \	117	scopeguard-1.1.0 \
99	serde-1.0.136 \	118	serde-1.0.136 \
100	serde_derive-1.0.136 \	119	serde_derive-1.0.136 \
Lines 110-125 CARGO_CRATES= ahash-0.7.6 \ Link Here
110	thiserror-1.0.30 \	129	thiserror-1.0.30 \
111	thiserror-impl-1.0.30 \	130	thiserror-impl-1.0.30 \
112	time-0.1.43 \	131	time-0.1.43 \
113	tinyvec-1.5.1 \	132	tinyvec-1.6.0 \
114	tinyvec_macros-0.1.0 \	133	tinyvec_macros-0.1.0 \
115	toml-0.5.8 \	134	toml-0.5.9 \
116	typenum-1.15.0 \	135	typenum-1.15.0 \
117	unicode-normalization-0.1.19 \	136	unicode-normalization-0.1.19 \
118	unicode-segmentation-1.9.0 \	137	unicode-segmentation-1.9.0 \
119	unicode-width-0.1.9 \	138	unicode-width-0.1.9 \
120	unicode-xid-0.2.2 \	139	unicode-xid-0.2.2 \
		140	unreachable-1.0.0 \
121	vec_map-0.8.2 \	141	vec_map-0.8.2 \
122	version_check-0.9.4 \	142	version_check-0.9.4 \
		143	void-1.0.2 \
		144	walkdir-2.3.2 \
123	wasi-0.10.2+wasi-snapshot-preview1 \	145	wasi-0.10.2+wasi-snapshot-preview1 \
124	winapi-0.3.9 \	146	winapi-0.3.9 \
125	winapi-i686-pc-windows-gnu-0.4.0 \	147	winapi-i686-pc-windows-gnu-0.4.0 \
Lines 136-144 CARGO_TEST= no Link Here
136	MAKE_ENV= ${CARGO_ENV:NCARGO_TARGET_DIR=*}	158	MAKE_ENV= ${CARGO_ENV:NCARGO_TARGET_DIR=*}
137	LDFLAGS+= -Wl,--as-needed	159	LDFLAGS+= -Wl,--as-needed
138		160
		161	pre-patch:
		162	@${REINPLACE_CMD} -e 's\|https://github.com/Neargye/magic_enum/archive/v0.7.3.zip\|${DISTDIR}/Neargye-magic_enum-v0.7.3_GH0.tar.gz\|' \
		163	-e 's\|86338841251da1bacab82684a76c4042\|fc20f4149a6d6a2caa8ff66f99dac7cf\|' \
		164	${WRKSRC}/dependencies/lib-magic_enum/getter/CMakeLists.txt.in
		165
139	post-patch:	166	post-patch:
140	@${REINPLACE_CMD} -e 's\|/some/place/where/the/data/is\|${DATADIR}\|' \	167	@${REINPLACE_CMD} -e 's\|/some/place/where/the/data/is\|${DATADIR}\|' \
141	${WRKSRC}/rust/stracciatella/src/stracciatella.rs	168	${WRKSRC}/rust/stracciatella/src/config/ja2_json.rs \
		169	${WRKSRC}/rust/stracciatella/src/config/engine_options.rs
142		170
143	post-install:	171	post-install:
144	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \	172	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \

Lines 1-24 Link Here

(-)b/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt (-23 / +10 lines)
1	--- dependencies/lib-lua/CMakeLists.txt.orig 2021-04-23 09:23:24 UTC	1	--- dependencies/lib-lua/CMakeLists.txt.orig 2023-01-25 17:13:43 UTC
2	+++ dependencies/lib-lua/CMakeLists.txt	2	+++ dependencies/lib-lua/CMakeLists.txt
3	@@ -1,4 +1,21 @@	3	@@ -3,7 +3,7 @@
4	# \file dependencies/lib-lua/CMakeLists.txt	4	option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON)
5	+	5	if (NOT LOCAL_LUA_LIB)
6	+option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON)	6	message(STATUS "Using system Lua")
7	+if (NOT LOCAL_LUA_LIB)	7	- find_package(Lua "5.3" REQUIRED)
8	+ message(STATUS "Using system Lua")	8	+ find_package(Lua "5.3" REQUIRED EXACT)
9	+ find_package(Lua "5.3" REQUIRED)	9	if (NOT LUA_FOUND)
10	+ if (NOT LUA_FOUND)	10	message(FATAL_ERROR "Lua 5.3 not found")
11	+ message(FATAL_ERROR "Lua 5.3 not found")	11	endif()
12	+ endif()
13	+
14	+ set(LUA_INCLUDE_DIRS "${LUA_INCLUDE_DIR}" PARENT_SCOPE)
15	+
16	+ add_library(lua INTERFACE)
17	+ target_link_libraries(lua INTERFACE "${LUA_LIBRARY}")
18	+
19	+ return()
20	+endif()
21	+
22	message(STATUS "<lua>")
23
24	CMAKE_MINIMUM_REQUIRED(VERSION 3.1)

Removed Link Here

(-)a/games/jaggedalliance2/files/patch-dependencies_lib-miniaudio_CMakeLists.txt (-34 lines)
1	--- dependencies/lib-miniaudio/CMakeLists.txt.orig 2022-04-27 09:14:13 UTC
2	+++ dependencies/lib-miniaudio/CMakeLists.txt
3	@@ -1,5 +1,31 @@
4	# \file dependencies/lib-miniaudio/CMakeLists.txt
5
6	+option(LOCAL_MINIAUDIO_LIB "Download and build miniaudio instead of searching the system" ON)
7	+if (NOT LOCAL_MINIAUDIO_LIB)
8	+ message(STATUS "Using system miniaudio")
9	+
10	+ if (NOT DEFINED MINIAUDIO_INCLUDE_DIR)
11	+ message(FATAL_ERROR "MINIAUDIO_INCLUDE_DIR var not set")
12	+ endif()
13	+
14	+ include(CheckIncludeFileCXX)
15	+ set (CMAKE_REQUIRED_INCLUDES "${MINIAUDIO_INCLUDE_DIR}")
16	+
17	+ CHECK_INCLUDE_FILE_CXX("miniaudio.h" MINIAUDIO_FOUND)
18	+ if (NOT MINIAUDIO_FOUND)
19	+ message(FATAL_ERROR "miniaudio.h not found")
20	+ endif()
21	+
22	+ CHECK_INCLUDE_FILE_CXX("extras/stb_vorbis.c" VORBIS_FOUND)
23	+ if (NOT VORBIS_FOUND)
24	+ message(FATAL_ERROR "miniaudio extras/stb_vorbis.c not found")
25	+ endif()
26	+
27	+ set(MINIAUDIO_INCLUDE_DIRS "${MINIAUDIO_INCLUDE_DIR}" PARENT_SCOPE)
28	+
29	+ return()
30	+endif()
31	+
32	message(STATUS "<miniaudio>")
33
34	# create getter

Removed Link Here

(-)a/games/jaggedalliance2/files/patch-dependencies_lib-sol2_CMakeLists.txt (-23 lines)
1	--- dependencies/lib-sol2/CMakeLists.txt.orig 2021-04-23 09:23:24 UTC
2	+++ dependencies/lib-sol2/CMakeLists.txt
3	@@ -1,5 +1,20 @@
4	# \file dependencies/lib-sol2/CMakeLists.txt
5
6	+option(LOCAL_SOL_LIB "Download and build Sol2 instead of searching the system" ON)
7	+if (NOT LOCAL_SOL_LIB)
8	+ message(STATUS "Using system Sol2")
9	+ find_package(sol2 "3.2.2"
10	+ REQUIRED
11	+ PATH_SUFFIXES lib/cmake/sol2 # path to sol2-config.cmake
12	+ )
13	+ if (NOT sol2_FOUND)
14	+ message(FATAL_ERROR "Sol2 not found")
15	+ endif()
16	+
17	+ set(SOL_INCLUDE_DIR "${SOL2_INCLUDE_DIRS}" PARENT_SCOPE)
18	+ return()
19	+endif()
20	+
21	message(STATUS "<sol2>")
22
23	# create getter

Removed Link Here

(-)a/games/jaggedalliance2/files/patch-src_sgp_SoundMan.cc (-12 lines)
1	--- src/sgp/SoundMan.cc.orig 2022-04-27 09:14:13 UTC
2	+++ src/sgp/SoundMan.cc
3	@@ -696,7 +696,7 @@ size_t MiniaudioReadProc(ma_decoder* pDecoder, void* p
4	return SDL_RWread(rwOps, pBufferOut, sizeof(UINT8), bytesToRead);
5	}
6
7	-ma_bool32 MiniaudioSeekProc(ma_decoder* pDecoder, int byteOffset, ma_seek_origin origin) {
8	+ma_bool32 MiniaudioSeekProc(ma_decoder* pDecoder, ma_int64 byteOffset, ma_seek_origin origin) {
9	auto rwOps = (SDL_RWops*)pDecoder->pUserData;
10	auto sdlOrigin = RW_SEEK_SET;
11	if (origin == ma_seek_origin::ma_seek_origin_current) {
12	-