[pkgsrc/trunk]: pkgsrc/games/ioquake3 Update ioquake3 to 1.36.20200125 (lates...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games/ioquake3 Update ioquake3 to 1.36.20200125 (lates...
From: jmcneill <jmcneill%pkgsrc.org@localhost>
Date: Sat, 25 Jan 2020 21:22:57 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/34c1ee969802
branches:  trunk
changeset: 410077:34c1ee969802
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sat Jan 25 20:13:49 2020 +0000

description:
Update ioquake3 to 1.36.20200125 (latest from Github).

The project seems to no longer do official releases.

diffstat:

 games/ioquake3/Makefile                                |   17 +-
 games/ioquake3/PLIST                                   |    4 +-
 games/ioquake3/distinfo                                |   18 +-
 games/ioquake3/patches/patch-aa                        |   23 +-
 games/ioquake3/patches/patch-ab                        |   13 -
 games/ioquake3/patches/patch-ac                        |  308 +---------------
 games/ioquake3/patches/patch-ad                        |   24 -
 games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c |   12 +-
 8 files changed, 67 insertions(+), 352 deletions(-)

diffs (truncated from 533 to 300 lines):

diff -r bbcd154635c9 -r 34c1ee969802 games/ioquake3/Makefile
--- a/games/ioquake3/Makefile   Sat Jan 25 19:26:42 2020 +0000
+++ b/games/ioquake3/Makefile   Sat Jan 25 20:13:49 2020 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2020/01/25 16:07:15 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2020/01/25 20:13:49 jmcneill Exp $
 #
 
-DISTNAME=      ioquake3-1.36
-PKGREVISION=   3
+DISTNAME=      ioquake3-1.36.20200125
 CATEGORIES=    games
-MASTER_SITES=  http://ioquake3.org/files/1.36/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=ioquake/}
+GITHUB_PROJECT=        ioq3
+GITHUB_TAG=    daae32ddfdab2172a628072ed3ff7dd1fc1563fe
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.ioquake3.org/
@@ -21,8 +21,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE:U} == "evbarm"
+.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
 QUAKE_ARCH!=   uname -m
+.elif ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "aarch64"
+QUAKE_ARCH=    ${MACHINE_CPU}
 .else
 QUAKE_ARCH=    ${MACHINE_ARCH}
 .endif
@@ -34,6 +36,7 @@
 NOT_PAX_MPROTECT_SAFE+=        lib/ioquake3/ioquake3.${QUAKE_ARCH}
 
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bbcd154635c9 -r 34c1ee969802 games/ioquake3/PLIST
--- a/games/ioquake3/PLIST      Sat Jan 25 19:26:42 2020 +0000
+++ b/games/ioquake3/PLIST      Sat Jan 25 20:13:49 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/04/18 20:44:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/25 20:13:49 jmcneill Exp $
 lib/ioquake3/baseq3/cgame${QUAKE_ARCH}.so
 lib/ioquake3/baseq3/qagame${QUAKE_ARCH}.so
 lib/ioquake3/baseq3/ui${QUAKE_ARCH}.so
@@ -7,3 +7,5 @@
 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
diff -r bbcd154635c9 -r 34c1ee969802 games/ioquake3/distinfo
--- a/games/ioquake3/distinfo   Sat Jan 25 19:26:42 2020 +0000
+++ b/games/ioquake3/distinfo   Sat Jan 25 20:13:49 2020 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.7 2020/01/25 16:07:15 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2020/01/25 20:13:49 jmcneill Exp $
 
-SHA1 (ioquake3-1.36.tar.bz2) = 0f92891e2b174253d02f666fd22e147c886089b4
-RMD160 (ioquake3-1.36.tar.bz2) = af9f65bbde2fe5531fa371ec6d2023126a523293
-SHA512 (ioquake3-1.36.tar.bz2) = fdd8e0ab56966cdc614eff45ab478b87255cfb1b50ba10b3141bcfcc569fc620d281de93333d39119b2d7b43aac3900ecf826a0459fc89bb2f57e30ae2425645
-Size (ioquake3-1.36.tar.bz2) = 3503058 bytes
-SHA1 (patch-aa) = c259a5261704d3b71824de60667cdc4287fe7ae7
-SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2
-SHA1 (patch-ac) = 4631bdda582aa105b661f45e09e0d5eb68713978
-SHA1 (patch-ad) = 577ca1c8fab64289d6f91e9e02542094cf7f2800
-SHA1 (patch-code_tools_lcc_cpp_unix.c) = 7d9e4bf34dd0c6df0c0267449d3365604d972fdd
+SHA1 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 791bc69ea853ced457134ed4759a76b40cd0e008
+RMD160 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 10c18309b358b0b091073f96c3ddaeb7c1535aa5
+SHA512 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 
689a0efa6eaf88fcf98616c100df625b77617c55e351455cc25727fea525748855c58e2288f04d86372d392a556f2ef4926e2c808f75e104ac328baa9458c4d1
+Size (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 7691640 bytes
+SHA1 (patch-aa) = b146df4f36fc7f9e0bfece50bd154c24e507dc2f
+SHA1 (patch-ac) = dc32068082c3493eb503811c2577b8fadb2745d3
+SHA1 (patch-code_tools_lcc_cpp_unix.c) = e80699461d92b9a659c88c0f5d66580ecf237f5f
diff -r bbcd154635c9 -r 34c1ee969802 games/ioquake3/patches/patch-aa
--- a/games/ioquake3/patches/patch-aa   Sat Jan 25 19:26:42 2020 +0000
+++ b/games/ioquake3/patches/patch-aa   Sat Jan 25 20:13:49 2020 +0000
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2020/01/25 16:07:15 jmcneill Exp $
+$NetBSD: patch-aa,v 1.5 2020/01/25 20:13:49 jmcneill Exp $
 
---- code/qcommon/q_platform.h.orig     2009-03-02 17:29:30.000000000 +0000
+--- code/qcommon/q_platform.h.orig     2019-12-07 13:16:15.000000000 +0000
 +++ code/qcommon/q_platform.h
-@@ -163,6 +163,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
- #define ARCH_STRING "mips"
- #elif defined __sh__
- #define ARCH_STRING "sh"
-+#elif defined __arm__
-+#define ARCH_STRING "arm"
- #endif
- 
- #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
-@@ -177,7 +179,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
+@@ -201,7 +201,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
  
  //=================================================================== BSD ===
  
@@ -20,7 +11,7 @@
  
  #include <sys/types.h>
  #include <machine/endian.h>
-@@ -192,6 +194,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
+@@ -216,6 +216,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
  #define OS_STRING "openbsd"
  #elif defined(__NetBSD__)
  #define OS_STRING "netbsd"
@@ -29,12 +20,10 @@
  #endif
  
  #define ID_INLINE inline
-@@ -201,6 +205,12 @@ Foundation, Inc., 51 Franklin St, Fifth 
- #define ARCH_STRING "i386"
+@@ -229,6 +231,10 @@ Foundation, Inc., 51 Franklin St, Fifth 
+ #define ARCH_STRING "x86_64"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
-+#elif defined __x86_64__
-+#define ARCH_STRING "x86_64"
 +#elif defined __arm__
 +#define ARCH_STRING "arm"
 +#elif defined __aarch64__
diff -r bbcd154635c9 -r 34c1ee969802 games/ioquake3/patches/patch-ab
--- a/games/ioquake3/patches/patch-ab   Sat Jan 25 19:26:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
-
---- code/qcommon/q_shared.h.orig       2009-01-12 12:28:35.000000000 -0500
-+++ code/qcommon/q_shared.h
-@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
-   #define GAMENAME_FOR_MASTER         "Quake3Arena"
- #endif
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) || !defined(PRODUCT_VERSION)
-   #define PRODUCT_VERSION "1.35"
- #endif
- 
diff -r bbcd154635c9 -r 34c1ee969802 games/ioquake3/patches/patch-ac
--- a/games/ioquake3/patches/patch-ac   Sat Jan 25 19:26:42 2020 +0000
+++ b/games/ioquake3/patches/patch-ac   Sat Jan 25 20:13:49 2020 +0000
@@ -1,298 +1,58 @@
-$NetBSD: patch-ac,v 1.3 2013/10/28 23:45:59 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2020/01/25 20:13:49 jmcneill Exp $
 
---- Makefile.orig      2009-04-22 18:54:48.000000000 +0000
+--- Makefile.orig      2019-12-07 13:16:15.000000000 +0000
 +++ Makefile
-@@ -261,16 +261,13 @@ ifeq ($(PLATFORM),linux)
-   OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
- 
-   ifeq ($(ARCH),x86_64)
--    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
--      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--      -fstrength-reduce
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
-     # experimental x86_64 jit compiler! you need GNU as
-     HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),i386)
-     OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
--      -funroll-loops -falign-loops=2 -falign-jumps=2 \
--      -falign-functions=2 -fstrength-reduce
-+      -funroll-loops
-     HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
-@@ -457,10 +454,7 @@ ifeq ($(PLATFORM),mingw32)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS
-   endif
- 
--  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
--    -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
--    -fstrength-reduce
--
-+  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math
-   HAVE_VM_COMPILED = true
+@@ -11,6 +11,13 @@ ifeq ($(COMPILE_PLATFORM),sunos)
+   COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/')
+ endif
  
-   SHLIBEXT=dll
-@@ -550,8 +544,7 @@ ifeq ($(PLATFORM),freebsd)
-   ifeq ($(ARCH),i386)
-     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
-       -march=pentium -fomit-frame-pointer -pipe -ffast-math \
--      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--      -funroll-loops -fstrength-reduce
-+      -funroll-loops
-     HAVE_VM_COMPILED=true
-   else
-     BASE_CFLAGS += -DNO_VM_COMPILED
-@@ -611,8 +604,7 @@ ifeq ($(PLATFORM),openbsd)
-   BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include
-   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
-     -march=pentium -fomit-frame-pointer -pipe -ffast-math \
--    -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--    -funroll-loops -fstrength-reduce
-+    -funroll-loops
-   HAVE_VM_COMPILED=false
++ifeq ($(COMPILE_PLATFORM),netbsd)
++  COMPILE_CPU=$(shell uname -p)
++  ifeq ($(COMPILE_CPU),aarch64)
++    COMPILE_ARCH=$(COMPILE_CPU)
++  endif
++endif
++
+ ifndef BUILD_STANDALONE
+   BUILD_STANDALONE =
+ endif
+@@ -850,11 +857,38 @@ ifeq ($(PLATFORM),netbsd)
  
-   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-@@ -648,28 +640,211 @@ ifeq ($(PLATFORM),netbsd)
+   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
  
-   ifeq ($(shell uname -m),i386)
-     ARCH=i386
-+  else
-+  ifeq ($(shell uname -m),amd64)
-+    ARCH=x86_64
-+  endif
-+  endif
++  OPTIMIZEVM = -O3
++  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 +
-+  USE_MUMBLE=0
-+
-+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-+    -pipe -DUSE_ICON $(shell sdl-config --cflags)
-+
-+  ifeq ($(USE_OPENAL),1)
-+    BASE_CFLAGS += -DUSE_OPENAL
-+    ifeq ($(USE_OPENAL_DLOPEN),1)
-+      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
-+    endif
++  ifeq ($(ARCH),x86_64)
++    HAVE_VM_COMPILED=true
++  else
+   ifeq ($(ARCH),x86)
+     HAVE_VM_COMPILED=true
+   endif
 +  endif
 +
 +  ifeq ($(USE_CURL),1)
-+    BASE_CFLAGS += -DUSE_CURL
-+    ifeq ($(USE_CURL_DLOPEN),1)
-+      BASE_CFLAGS += -DUSE_CURL_DLOPEN
-+    endif
-+  endif
-+
-+  ifeq ($(USE_CODEC_VORBIS),1)
-+    BASE_CFLAGS += -DUSE_CODEC_VORBIS
-+  endif
-+
-+  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
-+
-+  ifeq ($(ARCH),x86_64)
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
-+    # experimental x86_64 jit compiler! you need GNU as
-+    HAVE_VM_COMPILED = true
-+  else
-+  ifeq ($(ARCH),i386)
-+    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-+      -funroll-loops
-+    HAVE_VM_COMPILED=true
-+  else
-+  ifeq ($(ARCH),ppc)
-+    BASE_CFLAGS += -maltivec
-+    HAVE_VM_COMPILED=true
-+  endif
-+  ifeq ($(ARCH),ppc64)
-+    BASE_CFLAGS += -maltivec
-+    HAVE_VM_COMPILED=true
-+  endif
-+  endif
-+  endif
-+
-+  ifneq ($(HAVE_VM_COMPILED),true)
-+    BASE_CFLAGS += -DNO_VM_COMPILED
-   endif
- 
--  LIBS=-lm
-   SHLIBEXT=so
-   SHLIBCFLAGS=-fPIC
-   SHLIBLDFLAGS=-shared $(LDFLAGS)
-+
-   THREAD_LIBS=-lpthread
-+  LIBS=-lm
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
-+  CLIENT_LIBS=$(shell sdl-config --libs) -lGL
- 
--  ifneq ($(ARCH),i386)
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated games/ioquake3 to 1.36.20200125
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/gcc9 lang/gcc9: broken on Linux-*-x86_64
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated games/ioquake3 to 1.36.20200125
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/gcc9 lang/gcc9: broken on Linux-*-x86_64
Indexes:
Home | Main Index | Thread Index | Old Index