Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_17150166503460"
MIME-Version: 1.0
Date: Mon, 6 May 2024 17:30:50 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/games
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240506173050.B39D3FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_17150166503460
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Mon May  6 17:30:50 UTC 2024

Modified Files:
	pkgsrc/games/assaultcube: Makefile Makefile.common distinfo
	pkgsrc/games/assaultcube-server: Makefile
Added Files:
	pkgsrc/games/assaultcube/patches: patch-source_src_server.cpp

Log Message:
assaultcube: fix on darwin again


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/assaultcube/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/assaultcube/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/assaultcube/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/assaultcube-server/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/assaultcube/patches/patch-source_src_server.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_17150166503460
Content-Disposition: inline
Content-Length: 4264
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/games/assaultcube/Makefile
diff -u pkgsrc/games/assaultcube/Makefile:1.22 pkgsrc/games/assaultcube/Makefile:1.23
--- pkgsrc/games/assaultcube/Makefile:1.22	Mon May  6 14:04:25 2024
+++ pkgsrc/games/assaultcube/Makefile	Mon May  6 17:30:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2024/05/06 14:04:25 nia Exp $
+# $NetBSD: Makefile,v 1.23 2024/05/06 17:30:50 nia Exp $
 
 COMMENT=	Cube-based FPS with realistic environments
 
@@ -13,6 +13,9 @@ LDFLAGS+=	${BUILDLINK_LDADD.iconv}
 .if ${OPSYS} == "Darwin"
 LDFLAGS+=	-framework OpenAL
 LDFLAGS+=	-framework OpenGL
+# server part needs SDL2 thread/semaphore functions,
+# but does not link against it
+LDFLAGS+=	-lSDL2
 .else
 .  include "../../audio/openal-soft/buildlink3.mk"
 .  include "../../graphics/MesaLib/buildlink3.mk"

Index: pkgsrc/games/assaultcube/Makefile.common
diff -u pkgsrc/games/assaultcube/Makefile.common:1.2 pkgsrc/games/assaultcube/Makefile.common:1.3
--- pkgsrc/games/assaultcube/Makefile.common:1.2	Mon May  6 14:04:25 2024
+++ pkgsrc/games/assaultcube/Makefile.common	Mon May  6 17:30:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2024/05/06 14:04:25 nia Exp $
+# $NetBSD: Makefile.common,v 1.3 2024/05/06 17:30:50 nia Exp $
 # used by games/assaultcube/Makefile
 # used by games/assaultcube-server/Makefile
 
@@ -39,6 +39,8 @@ ALL_ENV+=		ac_cv_func_gethostbyaddr_r=no
 
 # end of stuff for internal enet
 
+BUILDLINK_TRANSFORM.Darwin+=	rm:-lrt
+
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	libexec
 INSTALLATION_DIRS+=	share/assaultcube/config

Index: pkgsrc/games/assaultcube/distinfo
diff -u pkgsrc/games/assaultcube/distinfo:1.7 pkgsrc/games/assaultcube/distinfo:1.8
--- pkgsrc/games/assaultcube/distinfo:1.7	Mon May  6 14:04:25 2024
+++ pkgsrc/games/assaultcube/distinfo	Mon May  6 17:30:50 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2024/05/06 14:04:25 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/05/06 17:30:50 nia Exp $
 
 BLAKE2s (AssaultCube_v1.3.0.2_LockdownEdition_RC1.tar.bz2) = 3bdebf27494ce9587671ab5b52c1fc4d8855a67301c5e57d9659cb0c34eb9dfa
 SHA512 (AssaultCube_v1.3.0.2_LockdownEdition_RC1.tar.bz2) = d837e945681a44f76c5a17c651c0578d912fae1161b7d0fa3c5b06524c2639c8701b767c8a1aeb95d14066faa7c4ecb25f2d1ab845c10dce5cf655b59bbafcd9
 Size (AssaultCube_v1.3.0.2_LockdownEdition_RC1.tar.bz2) = 52071427 bytes
 SHA1 (patch-source_src_Makefile) = 8f06a6bc3ab3efdde9227abf25d39c32ec2b4076
+SHA1 (patch-source_src_server.cpp) = 77e3a9c90934cbceaf9df7c685aa4570d3edf029
 SHA1 (patch-source_src_tools.cpp) = 3b59ee5c6348918a844c8c88a870e69bb5a241ae

Index: pkgsrc/games/assaultcube-server/Makefile
diff -u pkgsrc/games/assaultcube-server/Makefile:1.2 pkgsrc/games/assaultcube-server/Makefile:1.3
--- pkgsrc/games/assaultcube-server/Makefile:1.2	Mon May  6 14:04:26 2024
+++ pkgsrc/games/assaultcube-server/Makefile	Mon May  6 17:30:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2024/05/06 14:04:26 nia Exp $
+# $NetBSD: Makefile,v 1.3 2024/05/06 17:30:50 nia Exp $
 
 BUILD_TARGET=	server
 
@@ -10,4 +10,8 @@ COMMENT=	Cube-based FPS with realistic e
 
 CONFLICTS+=	assaultcube-[0-9]*
 
+# assaultcube's server wants SDL2 on darwin for the thread functions
+# so just use the main package
+NOT_FOR_PLATFORM+=	Darwin-*-*
+
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/games/assaultcube/patches/patch-source_src_server.cpp
diff -u /dev/null pkgsrc/games/assaultcube/patches/patch-source_src_server.cpp:1.1
--- /dev/null	Mon May  6 17:30:50 2024
+++ pkgsrc/games/assaultcube/patches/patch-source_src_server.cpp	Mon May  6 17:30:50 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-source_src_server.cpp,v 1.1 2024/05/06 17:30:50 nia Exp $
+
+C++98 compliance.
+
+--- source/src/server.cpp.orig	2024-05-06 16:25:52.000000000 +0000
++++ source/src/server.cpp
+@@ -25,7 +25,7 @@ struct servergame
+     string servdesc_current;
+     ENetAddress servdesc_caller;
+     bool custom_servdesc;
+-    int sispaused = 0;
++    int sispaused;
+ 
+     // current game
+     string smapname, nextmapname;
+@@ -52,6 +52,7 @@ struct servergame
+         matchteamsize = 0;
+         forceintermission = false;
+         custom_servdesc = false;
++        sispaused = 0;
+         smode = 0;
+         interm = 0;
+         minremain = 0;


--_----------=_17150166503460--