CVS commit: pkgsrc/games/assaultcube

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May  6 12:12:16 UTC 2024

Modified Files:
        pkgsrc/games/assaultcube: Makefile distinfo
        pkgsrc/games/assaultcube/patches: patch-source_src_Makefile
            patch-source_src_platform.h
Added Files:
        pkgsrc/games/assaultcube/patches: patch-source_src_console.cpp

Log Message:
assaultcube: Port to Darwin.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/assaultcube/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/assaultcube/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/assaultcube/patches/patch-source_src_Makefile \
    pkgsrc/games/assaultcube/patches/patch-source_src_platform.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/assaultcube/patches/patch-source_src_console.cpp

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

Modified files:

Index: pkgsrc/games/assaultcube/Makefile
diff -u pkgsrc/games/assaultcube/Makefile:1.20 pkgsrc/games/assaultcube/Makefile:1.21
--- pkgsrc/games/assaultcube/Makefile:1.20      Mon May  6 07:46:35 2024
+++ pkgsrc/games/assaultcube/Makefile   Mon May  6 12:12:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2024/05/06 07:46:35 nia Exp $
+# $NetBSD: Makefile,v 1.21 2024/05/06 12:12:16 nia Exp $
 
 PKGREVISION=   16
 
@@ -8,6 +8,20 @@ BUILD_TARGET=  client master server
 
 .include "Makefile.common"
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+LDFLAGS+=      ${BUILDLINK_LDADD.iconv}
+
+.if ${OPSYS} == "Darwin"
+LDFLAGS+=      -framework OpenAL
+LDFLAGS+=      -framework OpenGL
+.else
+.  include "../../audio/openal-soft/buildlink3.mk"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+LDFLAGS+=      -lGL -lX11 -lopenal
+.endif
+
 CONFLICTS+=    assaultcube-server-[0-9]*
 
 INSTALLATION_DIRS+=    share/applications
@@ -20,12 +34,10 @@ post-install:
            ${DESTDIR}${PREFIX}/share/applications
 
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/assaultcube/distinfo
diff -u pkgsrc/games/assaultcube/distinfo:1.5 pkgsrc/games/assaultcube/distinfo:1.6
--- pkgsrc/games/assaultcube/distinfo:1.5       Tue Oct 26 10:43:47 2021
+++ pkgsrc/games/assaultcube/distinfo   Mon May  6 12:12:16 2024
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:43:47 nia Exp $
+$NetBSD: distinfo,v 1.6 2024/05/06 12:12:16 nia Exp $
 
 BLAKE2s (AssaultCube_v1.2.0.2.tar.bz2) = f4d6876aed7f72b5c9c171f1952c54618a596f847ebfbb0a90892b79f2c066e6
 SHA512 (AssaultCube_v1.2.0.2.tar.bz2) = e2a0d3380db6d2ac2773ea90703fd572504729b9214a6c105f39aefa4c06ff48720634c6601efdad8b9b3b22dec9bc3a9ea7e094839042bc3ff5cfdd88eac976
 Size (AssaultCube_v1.2.0.2.tar.bz2) = 48181347 bytes
-SHA1 (patch-source_src_Makefile) = 8825c40bf869166708a1f9277b1f77901137771d
+SHA1 (patch-source_src_Makefile) = 0283b583e11e381f6bfef038f7a2f7ed3e66e545
 SHA1 (patch-source_src_bot_bot__waypoint.cpp) = 5ded14f79b69ee6ec6c2e9628452a1d6db0d406e
 SHA1 (patch-source_src_command.cpp) = 9bf2127eff468fd213bf66d345daab982b1c0722
 SHA1 (patch-source_src_command.h) = 300f62adb527224c420ed2a6ce3044660fdb4e7a
+SHA1 (patch-source_src_console.cpp) = 7570309666c89a156b980b3757b92f613de9d9b5
 SHA1 (patch-source_src_console.h) = e1cc0060bee43f5c02a9e7107e02a651458f8b93
 SHA1 (patch-source_src_crypto.cpp) = fff2b1cf9cac8c4dd9999fc99ed5ce3200f331fc
 SHA1 (patch-source_src_editing.cpp) = 7bf829a47233358fe14341691e84c9bd5ff880b7
 SHA1 (patch-source_src_entity.h) = ab67abee7df1587eb01877a9aea64a1b28a940ea
 SHA1 (patch-source_src_main.cpp) = 4b3dc7617cb36054ed6de111e8994d22d2e0267b
 SHA1 (patch-source_src_master.cpp) = 95c9630e4f33e79ab9ef646532baada13b92e749
-SHA1 (patch-source_src_platform.h) = 82530eef173f161ed33cee368c0afd6ccd5644a7
+SHA1 (patch-source_src_platform.h) = b3c5b285093553f2ec3d0d2f8b5962108a1d3328
 SHA1 (patch-source_src_protos.h) = 0944251480debf25e8dc25463307c223ffebbfbb
 SHA1 (patch-source_src_rendercubes.cpp) = 740f5dc169a5e0b331437fd157238a5323a0c866
 SHA1 (patch-source_src_rendertext.cpp) = 3082ca174416c21157ef56fb4d09f3ae3653a47d

Index: pkgsrc/games/assaultcube/patches/patch-source_src_Makefile
diff -u pkgsrc/games/assaultcube/patches/patch-source_src_Makefile:1.1 pkgsrc/games/assaultcube/patches/patch-source_src_Makefile:1.2
--- pkgsrc/games/assaultcube/patches/patch-source_src_Makefile:1.1      Sun Jun 30 21:44:30 2019
+++ pkgsrc/games/assaultcube/patches/patch-source_src_Makefile  Mon May  6 12:12:16 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-source_src_Makefile,v 1.1 2019/06/30 21:44:30 nia Exp $
+$NetBSD: patch-source_src_Makefile,v 1.2 2024/05/06 12:12:16 nia Exp $
 
 - Do not force a compiler or CXXFLAGS.
 - Use LDFLAGS when linking.
+- Do not hardcore -lX11 -lGL -lopenal since we want this to work on
+  Darwin too.
 - Use libenet from pkgsrc.
 
 --- source/src/Makefile.orig   2013-11-09 23:12:11.000000000 +0000
@@ -29,7 +31,7 @@ $NetBSD: patch-source_src_Makefile,v 1.1
 -CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
 -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
 +CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags` `pkg-config --cflags libenet` -I../include
-+CLIENT_LIBS= -lX11 `sdl-config --libs` `pkg-config --libs libenet` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
++CLIENT_LIBS= `sdl-config --libs` `pkg-config --libs libenet` -lSDL_image -lz -lvorbisfile -lcurl
  endif
  
  CLIENT_OBJS= \
Index: pkgsrc/games/assaultcube/patches/patch-source_src_platform.h
diff -u pkgsrc/games/assaultcube/patches/patch-source_src_platform.h:1.1 pkgsrc/games/assaultcube/patches/patch-source_src_platform.h:1.2
--- pkgsrc/games/assaultcube/patches/patch-source_src_platform.h:1.1    Fri Jul  5 08:01:31 2019
+++ pkgsrc/games/assaultcube/patches/patch-source_src_platform.h        Mon May  6 12:12:16 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-source_src_platform.h,v 1.1 2019/07/05 08:01:31 nia Exp $
+$NetBSD: patch-source_src_platform.h,v 1.2 2024/05/06 12:12:16 nia Exp $
 
 [PATCH] fix some errors and warnings for GCC 6
 
@@ -34,3 +34,18 @@ https://github.com/assaultcube/AC/commit
  #ifdef __GNUC__
      #include <new>
      #include <signal.h>
+@@ -57,13 +50,12 @@
+ 
+     #include "GL/glext.h"
+ 
++    #include <libintl.h>
+     #ifdef __APPLE__
+-        #include "INTL/libintl.h"
+         #include "OpenAL/al.h"
+         #include "OpenAL/alc.h"
+         #include "Vorbis/vorbisfile.h"
+     #else
+-        #include <libintl.h>
+         #include "AL/al.h"
+         #include "AL/alc.h"
+         #include "vorbis/vorbisfile.h"

Added files:

Index: pkgsrc/games/assaultcube/patches/patch-source_src_console.cpp
diff -u /dev/null pkgsrc/games/assaultcube/patches/patch-source_src_console.cpp:1.1
--- /dev/null   Mon May  6 12:12:16 2024
+++ pkgsrc/games/assaultcube/patches/patch-source_src_console.cpp       Mon May  6 12:12:16 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-source_src_console.cpp,v 1.1 2024/05/06 12:12:16 nia Exp $
+
+No idea what this is trying to do, but the function doesn't resolve.
+
+--- source/src/console.cpp.orig        2024-05-06 12:04:56.534059613 +0000
++++ source/src/console.cpp
+@@ -379,9 +379,6 @@ void pasteconsole(char *dst)
+     GlobalUnlock(cb);
+     CloseClipboard();
+     #elif defined(__APPLE__)
+-    extern void mac_pasteconsole(char *commandbuf);
+-
+-    mac_pasteconsole(dst);
+     #else
+     SDL_SysWMinfo wminfo;
+     SDL_VERSION(&wminfo.version);