Wed Jul 3 19:02:59 2019 UTC ()
tyrquake: Update to 0.62

Changes:

* Model animation/movement interpolation (r_lerpmodels, r_lerpmove cvars)
* SDL video/input/sound target, now default for MacOS instead of X11.
* sndio sound target for OpenBSD (thanks Tony Spets/Jacob Meuser)
* Support for BJP1/2/3 and FITZ(666) network/demo protocols
* Support for Darkplaces and RMQ style BSP2/2PSB file formats
* Work around buggy timers on some windows systems/drivers (thanks MH!)
* Removed vid_win dependency on SciTech MGL (thanks MH!)
* Netmasks can be used with qwsv's addip/removeip; e.g. "addip 192.168.0.0/24"
* Fixed remote screenshots from QWSV
* Improved build system including new OSX, Win64, SDL targets
* Lots more code sharing between NQ/QW
* Use non-power-of-two OpenGL textures when extension is available
* New cvar "m_freelook" to replace need for manual editing "+mlook" in config


(nia)
diff -r1.10 -r1.11 pkgsrc/games/tyrquake/Makefile
diff -r1.5 -r1.6 pkgsrc/games/tyrquake/distinfo
diff -r1.1 -r1.2 pkgsrc/games/tyrquake/patches/patch-Makefile
cvs diff -r1.10 -r1.11 pkgsrc/games/tyrquake/Makefile (expand / switch to unified diff)

--- pkgsrc/games/tyrquake/Makefile 2018/07/04 13:40:20 1.10
+++ pkgsrc/games/tyrquake/Makefile 2019/07/03 19:02:59 1.11
@@ -1,39 +1,35 @@ @@ -1,39 +1,35 @@
1# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:20 jperkin Exp $ 1# $NetBSD: Makefile,v 1.11 2019/07/03 19:02:59 nia Exp $
2 2
3DISTNAME= tyrquake-0.61_20140630 3DISTNAME= tyrquake-0.62
4PKGREVISION= 2 
5CATEGORIES= games x11 4CATEGORIES= games x11
6#MASTER_SITES= https://disenchant.net/files/engine/ 5MASTER_SITES= https://disenchant.net/files/engine/
7MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/snj/tyrquake/ 
8 6
9MAINTAINER= snj@NetBSD.org 7MAINTAINER= snj@NetBSD.org
10HOMEPAGE= https://disenchant.net/tyrquake/ 8HOMEPAGE= https://disenchant.net/tyrquake/
11COMMENT= Conservative branch of Quake 9COMMENT= Conservative branch of Quake
12 
13LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
14 11
15USE_TOOLS+= gmake 12USE_TOOLS+= gmake
16 13
17WRKSRC= ${WRKDIR}/tyrquake 14WRKSRC= ${WRKDIR}/tyrutils-${PKGVERSION_NOREV}
18 15
19LDFLAGS+= ${LIBOSSAUDIO} 16LDFLAGS+= ${LIBOSSAUDIO}
20 17
21SUBST_CLASSES+= audio 18SUBST_CLASSES+= audio
22SUBST_STAGE.audio= pre-configure 19SUBST_STAGE.audio= pre-configure
23SUBST_MESSAGE.audio= Fixing path to the audio device. 20SUBST_MESSAGE.audio= Fixing path to the audio device.
24SUBST_FILES.audio= common/snd_oss.c 21SUBST_FILES.audio= common/snd_oss.c
25SUBST_SED.audio= -e "s|/dev/dsp|${DEVOSSAUDIO}|" 22SUBST_SED.audio= -e "s|/dev/dsp|${DEVOSSAUDIO}|"
26 23
27INSTALLATION_DIRS= bin 24INSTALLATION_DIRS= bin
28 25
29do-install: 26do-install:
30 ${INSTALL_PROGRAM} ${WRKSRC}/bin/tyr-* ${DESTDIR}${PREFIX}/bin 27 ${INSTALL_PROGRAM} ${WRKSRC}/bin/tyr-* ${DESTDIR}${PREFIX}/bin
31 28
32.include "../../graphics/MesaLib/buildlink3.mk" 29.include "../../graphics/MesaLib/buildlink3.mk"
33.include "../../x11/libXext/buildlink3.mk" 30.include "../../x11/libXext/buildlink3.mk"
34.include "../../x11/libXxf86dga/buildlink3.mk" 31.include "../../x11/libXxf86dga/buildlink3.mk"
35.include "../../x11/libXxf86vm/buildlink3.mk" 32.include "../../x11/libXxf86vm/buildlink3.mk"
36.include "../../x11/xorgproto/buildlink3.mk" 33.include "../../x11/xorgproto/buildlink3.mk"
37.include "../../mk/oss.buildlink3.mk" 34.include "../../mk/oss.buildlink3.mk"
38 
39.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/games/tyrquake/distinfo (expand / switch to unified diff)

--- pkgsrc/games/tyrquake/distinfo 2015/11/03 20:57:06 1.5
+++ pkgsrc/games/tyrquake/distinfo 2019/07/03 19:02:59 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 20:57:06 agc Exp $ 1$NetBSD: distinfo,v 1.6 2019/07/03 19:02:59 nia Exp $
2 2
3SHA1 (tyrquake-0.61_20140630.tar.gz) = 62e4e36f193e8ce2f2d555a9ff8f156300f7762a 3SHA1 (tyrquake-0.62.tar.gz) = 7d60ad70e13444d6f15e7df406a00813861cb4f8
4RMD160 (tyrquake-0.61_20140630.tar.gz) = d5f8100ae108ae18bf898094e76f417f6f5e111f 4RMD160 (tyrquake-0.62.tar.gz) = 6412f1f6f8aa355e298d6ba17cbf86f4af996809
5SHA512 (tyrquake-0.61_20140630.tar.gz) = 4664d62b3f36217039a8013f543e95ae071d27737f7417016725c237fcbf50c07af0d3a23b03d160a80c24a2c893ee0d7037052310baa5eea2473d3c8c5878ac 5SHA512 (tyrquake-0.62.tar.gz) = 16b4c5f6de2e77e09933248c030836ad07c129e8680f7f8b14e526fa865dad15cf94fce25bf2c3cc2e33da9a6ffa849475c02d0a8aa777e5037befd468d1ee4f
6Size (tyrquake-0.61_20140630.tar.gz) = 4077622 bytes 6Size (tyrquake-0.62.tar.gz) = 948269 bytes
7SHA1 (patch-Makefile) = 38507b8ec0af0b929904cc2eb5894922b13fc0a6 7SHA1 (patch-Makefile) = 58cd46fcd266d7d766cf3f166c19dc60b1d93e72
cvs diff -r1.1 -r1.2 pkgsrc/games/tyrquake/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/games/tyrquake/patches/patch-Makefile 2015/02/10 22:10:33 1.1
+++ pkgsrc/games/tyrquake/patches/patch-Makefile 2019/07/03 19:02:59 1.2
@@ -1,70 +1,71 @@ @@ -1,70 +1,71 @@
1$NetBSD: patch-Makefile,v 1.1 2015/02/10 22:10:33 snj Exp $ 1$NetBSD: patch-Makefile,v 1.2 2019/07/03 19:02:59 nia Exp $
2 2
3- add DragonFly support 3- add DragonFly support
4- add Solaris support 4- add Solaris support
5- honor pkgsrc LDFLAGS 5- honor pkgsrc LDFLAGS
6- don't invoke git to obtain version info 6- don't invoke git to obtain version info
7 7
8--- Makefile.orig 2015-02-10 13:43:40.000000000 -0800 8--- Makefile.orig 2019-06-09 11:15:40.000000000 +0000
9+++ Makefile 2015-02-10 14:00:56.000000000 -0800 9+++ Makefile
10@@ -28,7 +28,7 @@ TARGET_UNIX ?= $(if $(filter UNIX,$ 10@@ -28,7 +28,7 @@ TARGET_UNIX ?= $(if $(filter UNIX,$
11 # ============================================================================ 11 # ============================================================================
12  12
13 TYR_RELEASE := v0.62-pre 13 TYR_RELEASE := v0.62-pre
14-TYR_GIT := $(shell git describe --dirty 2> /dev/null) 14-TYR_GIT := $(shell git describe --dirty 2> /dev/null)
15+TYR_GIT := v0.61-1226-g0ca7766-dirty 15+TYR_GIT := v0.61-1226-g0ca7766-dirty
16 TYR_VERSION := $(if $(TYR_GIT),$(TYR_GIT),$(TYR_RELEASE)) 16 TYR_VERSION := $(if $(TYR_GIT),$(TYR_GIT),$(TYR_RELEASE))
17 TYR_VERSION_NUM ?= $(patsubst v%,%,$(TYR_VERSION)) 17 TYR_VERSION_NUM ?= $(patsubst v%,%,$(TYR_VERSION))
18  18
19@@ -52,7 +52,7 @@ TOPDIR := $(shell pwd) 19@@ -55,7 +55,7 @@ else
20 ifneq (,$(findstring MINGW32,$(SYSNAME))) 20 ifneq (,$(findstring MINGW64,$(SYSNAME)))
21 HOST_OS = WIN32 21 HOST_OS = WIN64
22 else 22 else
23-ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD)) 23-ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD))
24+ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD DragonFly)) 24+ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD DragonFly))
25 HOST_OS = UNIX 25 HOST_OS = UNIX
26 HOST_UNIX = bsd 26 HOST_UNIX = bsd
27 else 27 else
28@@ -68,12 +68,19 @@ ifneq (,$(findstring $(SYSNAME),Linux)) 28@@ -71,6 +71,12 @@ ifneq (,$(findstring $(SYSNAME),Linux))
29 HOST_OS = UNIX 29 HOST_OS = UNIX
30 HOST_UNIX = linux 30 HOST_UNIX = linux
31 else 31 else
32+ifneq (,$(findstring $(SYSNAME),SunOS)) 32+ifneq (,$(findstring $(SYSNAME),SunOS))
33+HOST_OS = UNIX 33+HOST_OS = UNIX
34+# enable this if someone can provide a cd_solaris.c with cdrom stuff 34+# enable this if someone can provide a cd_solaris.c with cdrom stuff
35+#HOST_UNIX = solaris 35+#HOST_UNIX = solaris
36+HOST_UNIX = null 36+HOST_UNIX = null
37+else 37+else
38 $(error OS type not detected.) 38 $(error OS type not detected.)
39 endif 39 endif
40 endif 40 endif
 41@@ -78,6 +84,7 @@ endif
41 endif 42 endif
42 endif 43 endif
43 endif 44 endif
44+endif 45+endif
45  46
46 # -------------------------------------------------------------------- 47 # --------------------------------------------------------------------
47 # Setup driver options, choosing sensible defaults based on target OS 48 # Setup driver options, choosing sensible defaults based on target OS
48@@ -412,7 +419,7 @@ endef 49@@ -416,7 +423,7 @@ endef
49 endif 50 endif
50 endif 51 endif
51  52
52-git_date = $(shell git log -1 --date=short --format="%ad" -- $< 2>/dev/null) 53-git_date = $(shell git log -1 --date=short --format="%ad" -- $< 2>/dev/null)
53+git_date = 2014-06-30 54+git_date = 2019-06-09
54 doc_version = $(git_date) $(TYR_VERSION) 55 doc_version = $(git_date) $(TYR_VERSION)
55  56
56 quiet_cmd_man2man = ' MAN2MAN $@' 57 quiet_cmd_man2man = ' MAN2MAN $@'
57@@ -988,23 +995,23 @@ ALL_QWSV_LFLAGS += $(patsubst %,-l%,$(AL 58@@ -989,23 +996,23 @@ ALL_QWSV_LFLAGS += $(patsubst %,-l%,$(AL
58 # ============================================================================ 59 # ============================================================================
59  60
60 $(BIN_DIR)/tyr-quake$(EXT): $(patsubst %,$(NQSWDIR)/%,$(ALL_NQSW_OBJS)) 61 $(BIN_DIR)/tyr-quake$(EXT): $(patsubst %,$(NQSWDIR)/%,$(ALL_NQSW_OBJS))
61- $(call do_cc_link,$(ALL_NQSW_LFLAGS)) 62- $(call do_cc_link,$(ALL_NQSW_LFLAGS))
62+ $(call do_cc_link,$(ALL_NQSW_LFLAGS)) $(LDFLAGS) 63+ $(call do_cc_link,$(ALL_NQSW_LFLAGS)) $(LDFLAGS)
63 $(call do_strip,$@) 64 $(call do_strip,$@)
64  65
65 $(BIN_DIR)/tyr-glquake$(EXT): $(patsubst %,$(NQGLDIR)/%,$(ALL_NQGL_OBJS)) 66 $(BIN_DIR)/tyr-glquake$(EXT): $(patsubst %,$(NQGLDIR)/%,$(ALL_NQGL_OBJS))
66- $(call do_cc_link,$(ALL_NQGL_LFLAGS)) 67- $(call do_cc_link,$(ALL_NQGL_LFLAGS))
67+ $(call do_cc_link,$(ALL_NQGL_LFLAGS)) $(LDFLAGS) 68+ $(call do_cc_link,$(ALL_NQGL_LFLAGS)) $(LDFLAGS)
68 $(call do_strip,$@) 69 $(call do_strip,$@)
69  70
70 $(BIN_DIR)/tyr-qwcl$(EXT): $(patsubst %,$(QWSWDIR)/%,$(ALL_QWSW_OBJS)) 71 $(BIN_DIR)/tyr-qwcl$(EXT): $(patsubst %,$(QWSWDIR)/%,$(ALL_QWSW_OBJS))