Attachment #233818 for bug #263708





PORTNAME=	ja2
DISTVERSIONPREFIX=	v
DISTVERSION=	0.19.1
PORTREVISION=	1
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.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_SDL=	sdl2
USE_GL=		gl
USE_XORG=	ice sm x11 xext
GH_TUPLE=	mackron:miniaudio:634cdb028f340075ae8e8a1126620695688d2ac3:miniaudio

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 \

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

		${STAGEDIR}${PREFIX}/bin/ja2-launcher \
		${STAGEDIR}${PREFIX}/bin/ja2-resource-pack

.include <bsd.port.pre.mk>

# 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 <bsd.port.post.mk>

Lines 1-4 Link Here

(-)b/games/jaggedalliance2/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1650500685	1	TIMESTAMP = 1651349655
2	SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47	2	SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47
3	SIZE (rust/crates/ahash-0.7.6.crate) = 38030	3	SIZE (rust/crates/ahash-0.7.6.crate) = 38030
4	SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f	4	SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
Lines 179-185 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	179	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	180	SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
181	SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783	181	SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
182	SHA256 (ja2-stracciatella-ja2-stracciatella-v0.19.0_GH0.tar.gz) = 8d204f2786b8e2cb8eca61005f89aae05e1ff2300079a61c15c1c61823dc037b	182	SHA256 (ja2-stracciatella-ja2-stracciatella-v0.19.1_GH0.tar.gz) = e9806755f471275b653408f5b1ffc6f1629e83ac2fe04370b8756ed6eb87fee7
183	SIZE (ja2-stracciatella-ja2-stracciatella-v0.19.0_GH0.tar.gz) = 26386346	183	SIZE (ja2-stracciatella-ja2-stracciatella-v0.19.1_GH0.tar.gz) = 26385836
184	SHA256 (mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz) = 4e21d471a09f644c6b6d0ee53f8df6d3019f1d2bc8b6dc3dc58a6ef3353b064e
185	SIZE (mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz) = 1227075

Lines 22-31 Link Here

(-)b/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt (-7 lines)
22	message(STATUS "<lua>")	22	message(STATUS "<lua>")
23		23
24	CMAKE_MINIMUM_REQUIRED(VERSION 3.1)	24	CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
25	@@ -31,4 +48,4 @@ LIST(REMOVE_ITEM LUA_SRC
26	"${SRC_DIR}/src/luac.c")
27
28	ADD_LIBRARY(lua ${LUA_SRC})
29	-message(STATUS "</lua>")
30	\ No newline at end of file
31	+message(STATUS "</lua>")




--- 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

Added Link Here

(-)b/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	}

Added Link Here

(-)b/games/jaggedalliance2/files/patch-src_sgp_SoundMan.cc (-1 / +11 lines)
0	-	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) {

Return to bug 263708

Lines 2-9 Link Here

(-)b/games/jaggedalliance2/Makefile (-12 / +21 lines)
2		2
3	PORTNAME= ja2	3	PORTNAME= ja2
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.19.0	5	DISTVERSION= 0.19.1
6	PORTREVISION= 1
7	CATEGORIES= games	6	CATEGORIES= games
8		7
9	MAINTAINER= timp87@gmail.com	8	MAINTAINER= timp87@gmail.com
Lines 22-28 ONLY_FOR_ARCHS_REASON= requires little endian environment Link Here
22		21
23	BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \	22	BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \
24	rapidjson>=1.1.0:devel/rapidjson \	23	rapidjson>=1.1.0:devel/rapidjson \
25	sol2>=3.2.2:devel/sol2	24	sol2>=3.2.2:devel/sol2 \
		25	miniaudio>=0.10.36<0.11:audio/miniaudio
26	LIB_DEPENDS= libfltk.so:x11-toolkits/fltk	26	LIB_DEPENDS= libfltk.so:x11-toolkits/fltk
27		27
28	USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53	28	USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53
Lines 32-41 GH_PROJECT= ja2-stracciatella Link Here
32	USE_SDL= sdl2	32	USE_SDL= sdl2
33	USE_GL= gl	33	USE_GL= gl
34	USE_XORG= ice sm x11 xext	34	USE_XORG= ice sm x11 xext
35	GH_TUPLE= mackron:miniaudio:634cdb028f340075ae8e8a1126620695688d2ac3:miniaudio
36		35
37	CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}"	36	CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" -DMINIAUDIO_INCLUDE_DIR="${PREFIX}/include/miniaudio"
38	CMAKE_OFF= LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB	37	CMAKE_OFF= LOCAL_STRING_THEORY_LIB WITH_UNITTESTS LOCAL_RAPIDJSON_LIB LOCAL_LUA_LIB LOCAL_SOL_LIB LOCAL_MINIAUDIO_LIB
39		38
40	CARGO_CRATES= ahash-0.7.6 \	39	CARGO_CRATES= ahash-0.7.6 \
41	aho-corasick-0.7.18 \	40	aho-corasick-0.7.18 \
Lines 137-147 CARGO_TEST= no Link Here
137	MAKE_ENV= ${CARGO_ENV:NCARGO_TARGET_DIR=*}	136	MAKE_ENV= ${CARGO_ENV:NCARGO_TARGET_DIR=*}
138	LDFLAGS+= -Wl,--as-needed	137	LDFLAGS+= -Wl,--as-needed
139		138
140	pre-patch:
141	@${REINPLACE_CMD} -e 's\|https://github.com/mackron/miniaudio/archive/634cdb028f340075ae8e8a1126620695688d2ac3.zip\|${DISTDIR}/mackron-miniaudio-634cdb028f340075ae8e8a1126620695688d2ac3_GH0.tar.gz\|' \
142	-e 's\|b30045e95cec65bfe1d9fe3639f480a2\|975a4d15815118a7ded8fbc7d3de68f6\|' \
143	${WRKSRC}/dependencies/lib-miniaudio/getter/CMakeLists.txt.in
144
145	post-patch:	139	post-patch:
146	@${REINPLACE_CMD} -e 's\|/some/place/where/the/data/is\|${DATADIR}\|' \	140	@${REINPLACE_CMD} -e 's\|/some/place/where/the/data/is\|${DATADIR}\|' \
147	${WRKSRC}/rust/stracciatella/src/stracciatella.rs	141	${WRKSRC}/rust/stracciatella/src/stracciatella.rs
Lines 151-154 post-install: Link Here
151	${STAGEDIR}${PREFIX}/bin/ja2-launcher \	145	${STAGEDIR}${PREFIX}/bin/ja2-launcher \
152	${STAGEDIR}${PREFIX}/bin/ja2-resource-pack	146	${STAGEDIR}${PREFIX}/bin/ja2-resource-pack
153		147
154	.include <bsd.port.mk>	148	.include <bsd.port.pre.mk>
		149
		150	# Compilation with clang's broken in 14-CURRENT
		151	.if ${OSVERSION} >= 1400000
		152	# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236344
		153	# Copy-pasted gcc-c++11-lib from Mk/Uses/compiler.mk
		154	USE_GCC= yes
		155	CHOSEN_COMPILER_TYPE= gcc
		156	CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1
		157	LDFLAGS+= -L${WRKDIR}
		158	_USES_configure+= 200:gcc-libc++-configure
		159	gcc-libc++-configure:
		160	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
		161	.endif
		162
		163	.include <bsd.port.post.mk>

Added Link Here

(-)b/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