CVS commit: pkgsrc/games/ioquake3

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/ioquake3
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 11 May 2024 10:05:15 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 11 10:05:15 UTC 2024

Modified Files:
        pkgsrc/games/ioquake3: MESSAGE Makefile PLIST distinfo
        pkgsrc/games/ioquake3/patches: patch-Makefile

Log Message:
ioquake3: Usability improvements, Darwin support


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/ioquake3/MESSAGE
cvs rdiff -u -r1.32 -r1.33 pkgsrc/games/ioquake3/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/ioquake3/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/games/ioquake3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/ioquake3/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/games/ioquake3/MESSAGE
diff -u pkgsrc/games/ioquake3/MESSAGE:1.2 pkgsrc/games/ioquake3/MESSAGE:1.3
--- pkgsrc/games/ioquake3/MESSAGE:1.2   Fri May 21 15:01:51 2021
+++ pkgsrc/games/ioquake3/MESSAGE       Sat May 11 10:05:15 2024
@@ -1,9 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2021/05/21 15:01:51 nia Exp $
+$NetBSD: MESSAGE,v 1.3 2024/05/11 10:05:15 nia Exp $
 
 To run Quake III Arena, you must place the file 'pak0.pk3' from your
 Quake 3 CD into:
 
  ${LOCALBASE}/lib/ioquake3/baseq3/
 
+or:
+
+ ~/.q3a/baseq3
+
 ===========================================================================

Index: pkgsrc/games/ioquake3/Makefile
diff -u pkgsrc/games/ioquake3/Makefile:1.32 pkgsrc/games/ioquake3/Makefile:1.33
--- pkgsrc/games/ioquake3/Makefile:1.32 Tue May  7 21:48:54 2024
+++ pkgsrc/games/ioquake3/Makefile      Sat May 11 10:05:15 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2024/05/07 21:48:54 nia Exp $
+# $NetBSD: Makefile,v 1.33 2024/05/11 10:05:15 nia Exp $
 #
 
 DISTNAME=      ioquake3-1.36.20200125
-PKGREVISION=   20
+PKGREVISION=   21
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ioquake/}
 GITHUB_PROJECT=        ioq3
@@ -19,16 +19,30 @@ INSTALL_TARGET=     copyfiles
 
 MAKE_FLAGS+=   COPYDIR=${DESTDIR}${PREFIX}/lib/ioquake3
 MAKE_FLAGS+=   PKG_CONFIG=${TOOLS_PATH.pkg-config:Q}
-MAKE_FLAGS+=   USE_INTERNAL_JPEG=0
-MAKE_FLAGS+=   USE_INTERNAL_OGG=0
-MAKE_FLAGS+=   USE_INTERNAL_OPUS=0
-MAKE_FLAGS+=   USE_INTERNAL_VORBIS=0
-MAKE_FLAGS+=   USE_INTERNAL_ZLIB=0
+MAKE_FLAGS+=   USE_INTERNAL_LIBS=0
+MAKE_FLAGS+=   USE_OPENAL=0
+MAKE_FLAGS+=   USE_RENDERER_DLOPEN=0
+
+# causes hang on game exit, needs investigating...
+MAKE_FLAGS+=   USE_VOIP=0
+
+# build only the original renderer for now
+MAKE_FLAGS+=   BUILD_RENDERER_OPENGL2=0
 
 .include "arch.mk"
 
 MAKE_FLAGS+=   COMPILE_ARCH=${QUAKE_ARCH:Q}
 
+.if ${SHLIB_TYPE} == "dylib"
+PLIST_SUBST+=  SO_EXT="dylib"
+.else
+PLIST_SUBST+=  SO_EXT="so"
+.endif
+
+.if ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 100700
+MAKE_FLAGS+=   MACOSX_VERSION_MIN=10.4
+.endif
+
 PLIST_SUBST+=  QUAKE_ARCH=${QUAKE_ARCH:Q}
 
 # recursive error after: VM_CompileX86: mprotect failed
@@ -47,12 +61,10 @@ post-install:
            ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
 .endfor
 
-.include "../../audio/openal-soft/buildlink3.mk"
 .include "../../audio/opusfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/games/ioquake3/PLIST
diff -u pkgsrc/games/ioquake3/PLIST:1.5 pkgsrc/games/ioquake3/PLIST:1.6
--- pkgsrc/games/ioquake3/PLIST:1.5     Sat Apr  3 18:03:12 2021
+++ pkgsrc/games/ioquake3/PLIST Sat May 11 10:05:15 2024
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2021/04/03 18:03:12 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2024/05/11 10:05:15 nia Exp $
 bin/ioq3ded
 bin/ioquake3
-lib/ioquake3/baseq3/cgame${QUAKE_ARCH}.so
-lib/ioquake3/baseq3/qagame${QUAKE_ARCH}.so
-lib/ioquake3/baseq3/ui${QUAKE_ARCH}.so
+lib/ioquake3/baseq3/cgame${QUAKE_ARCH}.${SO_EXT}
+lib/ioquake3/baseq3/qagame${QUAKE_ARCH}.${SO_EXT}
+lib/ioquake3/baseq3/ui${QUAKE_ARCH}.${SO_EXT}
 lib/ioquake3/ioq3ded.${QUAKE_ARCH}
 lib/ioquake3/ioquake3.${QUAKE_ARCH}
-lib/ioquake3/missionpack/cgame${QUAKE_ARCH}.so
-lib/ioquake3/missionpack/qagame${QUAKE_ARCH}.so
-lib/ioquake3/missionpack/ui${QUAKE_ARCH}.so
-lib/ioquake3/renderer_opengl1_${QUAKE_ARCH}.so
-lib/ioquake3/renderer_opengl2_${QUAKE_ARCH}.so
+lib/ioquake3/missionpack/cgame${QUAKE_ARCH}.${SO_EXT}
+lib/ioquake3/missionpack/qagame${QUAKE_ARCH}.${SO_EXT}
+lib/ioquake3/missionpack/ui${QUAKE_ARCH}.${SO_EXT}
 man/man6/ioq3ded.6
 man/man6/ioquake3.6

Index: pkgsrc/games/ioquake3/distinfo
diff -u pkgsrc/games/ioquake3/distinfo:1.13 pkgsrc/games/ioquake3/distinfo:1.14
--- pkgsrc/games/ioquake3/distinfo:1.13 Sun Jan 15 05:36:37 2023
+++ pkgsrc/games/ioquake3/distinfo      Sat May 11 10:05:15 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2023/01/15 05:36:37 mrg Exp $
+$NetBSD: distinfo,v 1.14 2024/05/11 10:05:15 nia Exp $
 
 BLAKE2s (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 73f65b336d36d24d523d96078b61f65c927d5a6e9636bee29413d0197e45472a
 SHA512 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 
689a0efa6eaf88fcf98616c100df625b77617c55e351455cc25727fea525748855c58e2288f04d86372d392a556f2ef4926e2c808f75e104ac328baa9458c4d1
 Size (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 7691640 bytes
-SHA1 (patch-Makefile) = 7d11e12f312caa2517f768702fddc3ec15fa81f5
+SHA1 (patch-Makefile) = e855406f2c7499e5defd5af962b4e2a6873282d2
 SHA1 (patch-code_qcommon_q__platform.h) = 7845c7ba9431c7a34c5fbfde702cc0b7e1dc66d5
 SHA1 (patch-code_renderergl1_tr__init.c) = a9968c3035d6558ea65ec1bd00afd628a01eab49
 SHA1 (patch-code_renderergl2_tr__init.c) = c38bb445cbb70f35cac4114b46c7172cacc7d44f

Index: pkgsrc/games/ioquake3/patches/patch-Makefile
diff -u pkgsrc/games/ioquake3/patches/patch-Makefile:1.2 pkgsrc/games/ioquake3/patches/patch-Makefile:1.3
--- pkgsrc/games/ioquake3/patches/patch-Makefile:1.2    Sun Jan 15 05:36:38 2023
+++ pkgsrc/games/ioquake3/patches/patch-Makefile        Sat May 11 10:05:15 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.2 2023/01/15 05:36:38 mrg Exp $
+$NetBSD: patch-Makefile,v 1.3 2024/05/11 10:05:15 nia Exp $
 
 - Add support for NetBSD-style uname.
 - Build client on NetBSD.
@@ -8,8 +8,8 @@ https://github.com/ioquake/ioq3/pull/466
 
 - Add -lrt on NetBSD that binutils 2.39 wants.
 
---- Makefile.orig      2019-12-07 05:16:15.000000000 -0800
-+++ Makefile   2023-01-14 18:34:38.285233929 -0800
+--- Makefile.orig      2019-12-07 13:16:15.000000000 +0000
++++ Makefile
 @@ -6,8 +6,8 @@
  COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g')
  COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
@@ -21,7 +21,7 @@ https://github.com/ioquake/ioq3/pull/466
    COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/')
  endif
  
-@@ -65,6 +65,10 @@
+@@ -65,6 +65,10 @@ ifeq ($(PLATFORM),mingw64)
    MINGW=1
  endif
  
@@ -32,7 +32,7 @@ https://github.com/ioquake/ioq3/pull/466
  ifeq ($(COMPILE_ARCH),i86pc)
    COMPILE_ARCH=x86
  endif
-@@ -338,7 +342,7 @@
+@@ -338,7 +342,7 @@ MKDIR=mkdir -p
  EXTRA_FILES=
  CLIENT_EXTRA_FILES=
  
@@ -41,7 +41,28 @@ https://github.com/ioquake/ioq3/pull/466
    TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\"
  endif
  
-@@ -712,7 +716,7 @@
+@@ -531,16 +535,16 @@ ifeq ($(PLATFORM),darwin)
+     RENDERER_LIBS += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+     CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib
+   else
+-    BASE_CFLAGS += -I/Library/Frameworks/SDL2.framework/Headers
+-    CLIENT_LIBS += -framework SDL2
+-    RENDERER_LIBS += -framework SDL2
++    CLIENT_CFLAGS += $(SDL_CFLAGS)
++    CLIENT_LIBS += $(SDL_LIBS)
++    RENDERER_LIBS += $(SDL_LIBS)
+   endif
+ 
+   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
+ 
+   SHLIBEXT=dylib
+   SHLIBCFLAGS=-fPIC -fno-common
+-  SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) -Wl,-U,_com_altivec
++  SHLIBLDFLAGS=-dynamiclib $(LDFLAGS)
+ 
+   NOTSHLIBCFLAGS=-mdynamic-no-pic
+ 
+@@ -712,7 +716,7 @@ ifeq ($(PLATFORM),freebsd)
    # flags
    BASE_CFLAGS = \
      -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
@@ -50,7 +71,7 @@ https://github.com/ioquake/ioq3/pull/466
    CLIENT_CFLAGS += $(SDL_CFLAGS)
    HAVE_VM_COMPILED = true
  
-@@ -766,7 +770,7 @@
+@@ -766,7 +770,7 @@ else # ifeq freebsd
  ifeq ($(PLATFORM),openbsd)
  
    BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
@@ -59,17 +80,14 @@ https://github.com/ioquake/ioq3/pull/466
    CLIENT_CFLAGS += $(SDL_CFLAGS)
  
    OPTIMIZEVM = -O3
-@@ -846,15 +850,34 @@
-   SHLIBEXT=so
-   SHLIBCFLAGS=-fPIC
+@@ -848,13 +852,36 @@ ifeq ($(PLATFORM),netbsd)
    SHLIBLDFLAGS=-shared $(LDFLAGS)
--  THREAD_LIBS=-lpthread
-+  THREAD_LIBS=-lpthread -lrt
-+
-+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-+    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
+   THREAD_LIBS=-lpthread
  
 -  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
++  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
++    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
++
 +  CLIENT_LIBS += $(SDL_LIBS)
 +  RENDERER_LIBS = $(SDL_LIBS)
 +
@@ -86,6 +104,10 @@ https://github.com/ioquake/ioq3/pull/466
 +      CLIENT_LIBS += $(CURL_LIBS)
 +    endif
 +  endif
++
++  ifeq ($(USE_MUMBLE),1)
++    CLIENT_LIBS += -lrt
++  endif
  
    ifeq ($(ARCH),x86)
      HAVE_VM_COMPILED=true

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/sysutils/superfile
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/sysutils/superfile
Indexes:

Home | Main Index | Thread Index | Old Index