ping. On Tue, May 19, 2020 at 04:20:18PM -0600, Thomas Frohwein wrote: > On Tue, May 19, 2020 at 07:03:23AM -0500, Paul Valencia wrote: > [...] > > Here is the diff to update uhexen2 to the latest version. I > > adapted the patches (line positions) so that they still apply > > in this version. > > > > Tested some levels on amd64 with the Steam assets of the game > > (*.pak files) in Single Player and Co-op. > > I tested it in single player briefly. Runs nicely as long as I don't > try to turn on Anti-Aliasing - then the menu fonts start to flicker. > > I don't know if that's a pre-existing or new problem. Would also defer > details of all the CFLAGS etc changes to maintainer's comment.
Index: Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 12 Jul 2019 20:46:26 -0000 1.9 +++ Makefile 19 May 2020 11:16:02 -0000 @@ -2,13 +2,12 @@ COMMENT = Hexen II: Hammer of Thyrion -V = 1.5.8 +V = 1.5.9 DISTNAME = hexen2source-${V} PKGNAME = uhexen2-${V} EXTRACT_SUFX = .tgz DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ hexen2-${V}-linux-i586.tgz -REVISION = 2 CATEGORIES = games HOMEPAGE = http://uhexen2.sourceforge.net/ Index: distinfo =================================================================== RCS file: /cvs/ports/games/uhexen2/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 31 Dec 2016 10:48:00 -0000 1.2 +++ distinfo 19 May 2020 11:16:02 -0000 @@ -1,4 +1,4 @@ -SHA256 (hexen2-1.5.8-linux-i586.tgz) = D2aTVlfAxPPjmy8IcZ/l+Sa+K5VNxYM0pl7eslDVFgM= -SHA256 (hexen2source-1.5.8.tgz) = ++bQW0oQuC0YF/rszBiZapOybQgU/k5fbnXZSGJmBGM= -SIZE (hexen2-1.5.8-linux-i586.tgz) = 4631311 -SIZE (hexen2source-1.5.8.tgz) = 2473776 +SHA256 (hexen2-1.5.9-linux-i586.tgz) = lmvSP10gvtjKyjNG5R/m8mRf3h66sqy4htQ14504ASs= +SHA256 (hexen2source-1.5.9.tgz) = KqhMFBqCD5CHhQqs82hKX3HENEKLxXVFiZ7aG5oow+A= +SIZE (hexen2-1.5.9-linux-i586.tgz) = 4633437 +SIZE (hexen2source-1.5.9.tgz) = 2529121 Index: patches/patch-engine_hexen2_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-engine_hexen2_Makefile --- patches/patch-engine_hexen2_Makefile 20 Nov 2018 21:41:00 -0000 1.3 +++ patches/patch-engine_hexen2_Makefile 19 May 2020 11:16:02 -0000 @@ -5,30 +5,32 @@ Use standard optimisations. Index: engine/hexen2/Makefile --- engine/hexen2/Makefile.orig +++ engine/hexen2/Makefile -@@ -133,7 +133,7 @@ USE_CODEC_MODPLUG=no +@@ -136,7 +136,7 @@ USE_CODEC_XMP=no USE_CODEC_UMX=no # either timidity (preferred) or wildmidi (both possible # but not needed nor meaningful) -USE_CODEC_TIMIDITY=yes +USE_CODEC_TIMIDITY=no USE_CODEC_WILDMIDI=no - # compile timidity with DLS instruments support? (no: - # the dls code isn't good enough and isn't used in unix -@@ -194,12 +194,7 @@ endif - # Overrides for the default CPUFLAGS + # which library to use for mp3 decoding: mad or mpg123 + MP3LIB=mad +@@ -198,15 +198,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) --ifndef DEBUG +-ifdef DEBUG +-CFLAGS += -g +-else -# optimization flags --CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer +-CFLAGS += -O2 -DNDEBUG=1 -ffast-math +-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!! +-CFLAGS += -fomit-frame-pointer -endif -+CFLAGS += -Wall CPPFLAGS= LDFLAGS = -@@ -384,6 +379,9 @@ ifeq ($(TARGET_OS),unix) +@@ -405,6 +396,9 @@ ifeq ($(TARGET_OS),unix) # common unix: NASMFLAGS=-f elf -d_NO_PREFIX Index: patches/patch-engine_hexen2_server_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexen2_server_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-engine_hexen2_server_Makefile --- patches/patch-engine_hexen2_server_Makefile 31 Dec 2016 10:48:00 -0000 1.2 +++ patches/patch-engine_hexen2_server_Makefile 19 May 2020 11:16:02 -0000 @@ -2,19 +2,22 @@ $OpenBSD: patch-engine_hexen2_server_Mak Use standard optimisations. ---- engine/hexen2/server/Makefile.orig Mon Jul 25 06:35:24 2016 -+++ engine/hexen2/server/Makefile Sat Dec 31 20:44:08 2016 -@@ -66,12 +66,7 @@ endif - # Overrides for the default CPUFLAGS +Index: engine/hexen2/server/Makefile +--- engine/hexen2/server/Makefile.orig ++++ engine/hexen2/server/Makefile +@@ -67,15 +67,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) --ifndef DEBUG +-ifdef DEBUG +-CFLAGS += -g +-else -# optimization flags --CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer +-CFLAGS += -O2 -DNDEBUG=1 -ffast-math +-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!! +-CFLAGS += -fomit-frame-pointer -endif -+CFLAGS += -Wall CPPFLAGS= LDFLAGS = Index: patches/patch-engine_hexenworld_client_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexenworld_client_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-engine_hexenworld_client_Makefile --- patches/patch-engine_hexenworld_client_Makefile 20 Nov 2018 21:41:00 -0000 1.3 +++ patches/patch-engine_hexenworld_client_Makefile 19 May 2020 11:16:02 -0000 @@ -5,30 +5,32 @@ Disable internal timidity. Use standard Index: engine/hexenworld/client/Makefile --- engine/hexenworld/client/Makefile.orig +++ engine/hexenworld/client/Makefile -@@ -126,7 +126,7 @@ USE_CODEC_MODPLUG=no +@@ -129,7 +129,7 @@ USE_CODEC_XMP=no USE_CODEC_UMX=no # either timidity (preferred) or wildmidi (both possible # but not needed nor meaningful) -USE_CODEC_TIMIDITY=yes +USE_CODEC_TIMIDITY=no USE_CODEC_WILDMIDI=no - # compile timidity with DLS instruments support? (no: - # the dls code isn't good enough and isn't used in unix -@@ -157,12 +157,7 @@ endif - # Overrides for the default CPUFLAGS + # which library to use for mp3 decoding: mad or mpg123 + MP3LIB=mad +@@ -157,15 +157,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) --ifndef DEBUG +-ifdef DEBUG +-CFLAGS += -g +-else -# optimization flags --CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer +-CFLAGS += -O2 -DNDEBUG=1 -ffast-math +-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!! +-CFLAGS += -fomit-frame-pointer -endif -+CFLAGS += -Wall CPPFLAGS= LDFLAGS = -@@ -349,6 +344,9 @@ ifeq ($(TARGET_OS),unix) +@@ -366,6 +357,9 @@ ifeq ($(TARGET_OS),unix) # common unix: NASMFLAGS=-f elf -d_NO_PREFIX Index: patches/patch-engine_hexenworld_server_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-engine_hexenworld_server_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-engine_hexenworld_server_Makefile --- patches/patch-engine_hexenworld_server_Makefile 31 Dec 2016 10:48:00 -0000 1.2 +++ patches/patch-engine_hexenworld_server_Makefile 19 May 2020 11:16:02 -0000 @@ -2,19 +2,22 @@ $OpenBSD: patch-engine_hexenworld_server Use standard optimisations. ---- engine/hexenworld/server/Makefile.orig Mon Jul 25 06:35:24 2016 -+++ engine/hexenworld/server/Makefile Sat Dec 31 20:44:37 2016 -@@ -59,12 +59,7 @@ endif - # Overrides for the default CPUFLAGS +Index: engine/hexenworld/server/Makefile +--- engine/hexenworld/server/Makefile.orig ++++ engine/hexenworld/server/Makefile +@@ -60,15 +60,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) --ifndef DEBUG +-ifdef DEBUG +-CFLAGS += -g +-else -# optimization flags --CFLAGS += -O2 -DNDEBUG=1 -ffast-math -fomit-frame-pointer +-CFLAGS += -O2 -DNDEBUG=1 -ffast-math +-# NOTE: -fomit-frame-pointer is broken with ancient gcc versions!! +-CFLAGS += -fomit-frame-pointer -endif -+CFLAGS += -Wall CPPFLAGS= LDFLAGS = Index: patches/patch-h2patch_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-h2patch_Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-h2patch_Makefile --- patches/patch-h2patch_Makefile 30 May 2014 15:25:48 -0000 1.1.1.1 +++ patches/patch-h2patch_Makefile 19 May 2020 11:16:02 -0000 @@ -2,19 +2,20 @@ $OpenBSD: patch-h2patch_Makefile,v 1.1.1 Use standard optimisations. ---- h2patch/Makefile.orig Thu Jan 3 18:28:36 2013 -+++ h2patch/Makefile Sat May 24 01:20:28 2014 -@@ -18,12 +18,7 @@ endif - LINKER = $(CC) +Index: h2patch/Makefile +--- h2patch/Makefile.orig ++++ h2patch/Makefile +@@ -19,13 +19,6 @@ LINKER = $(CC) CPUFLAGS= --CFLAGS = -g -Wall + CFLAGS = -Wall -CFLAGS += $(CPUFLAGS) -ifndef DEBUG -CFLAGS += -O2 -DNDEBUG=1 +-else +-CFLAGS += -g -endif -LDFLAGS = -+CFLAGS += -Wall XDELTA_DIR:= $(LIBS_DIR)/xdelta3 XDFLAGS:= -DXD3_DEBUG=0 Index: patches/patch-hw_utils_hwmaster_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-hw_utils_hwmaster_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-hw_utils_hwmaster_Makefile --- patches/patch-hw_utils_hwmaster_Makefile 31 Dec 2016 10:48:00 -0000 1.2 +++ patches/patch-hw_utils_hwmaster_Makefile 19 May 2020 11:16:02 -0000 @@ -2,21 +2,22 @@ $OpenBSD: patch-hw_utils_hwmaster_Makefi Use standard optimisations. ---- hw_utils/hwmaster/Makefile.orig Tue Apr 19 00:03:18 2016 -+++ hw_utils/hwmaster/Makefile Mon Dec 26 13:16:56 2016 -@@ -46,14 +46,9 @@ endif - # Overrides for the default CPUFLAGS +Index: hw_utils/hwmaster/Makefile +--- hw_utils/hwmaster/Makefile.orig ++++ hw_utils/hwmaster/Makefile +@@ -47,15 +47,8 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) -ifndef DEBUG -CFLAGS += -O2 -DNDEBUG=1 +-else +-CFLAGS += -g -endif - -CPPFLAGS= -LDFLAGS = -+CFLAGS += -Wall +CPPFLAGS += +LDFLAGS += Index: patches/patch-hw_utils_hwmquery_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-hw_utils_hwmquery_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-hw_utils_hwmquery_Makefile --- patches/patch-hw_utils_hwmquery_Makefile 31 Dec 2016 10:48:00 -0000 1.2 +++ patches/patch-hw_utils_hwmquery_Makefile 19 May 2020 11:16:02 -0000 @@ -2,21 +2,22 @@ $OpenBSD: patch-hw_utils_hwmquery_Makefi Use standard optimisations. ---- hw_utils/hwmquery/Makefile.orig Tue Apr 19 00:03:18 2016 -+++ hw_utils/hwmquery/Makefile Mon Dec 26 13:16:56 2016 -@@ -46,14 +46,7 @@ endif - # Overrides for the default CPUFLAGS +Index: hw_utils/hwmquery/Makefile +--- hw_utils/hwmquery/Makefile.orig ++++ hw_utils/hwmquery/Makefile +@@ -47,15 +47,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) -ifndef DEBUG -CFLAGS += -O2 -DNDEBUG=1 +-else +-CFLAGS += -g -endif - -CPPFLAGS= -LDFLAGS = -+CFLAGS += -Wall # compiler includes INCLUDES= -I. -I$(UHEXEN2_SHARED) Index: patches/patch-hw_utils_hwrcon_Makefile =================================================================== RCS file: /cvs/ports/games/uhexen2/patches/patch-hw_utils_hwrcon_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-hw_utils_hwrcon_Makefile --- patches/patch-hw_utils_hwrcon_Makefile 31 Dec 2016 10:48:00 -0000 1.2 +++ patches/patch-hw_utils_hwrcon_Makefile 19 May 2020 11:16:02 -0000 @@ -2,21 +2,22 @@ $OpenBSD: patch-hw_utils_hwrcon_Makefile Use standard optimisations. ---- hw_utils/hwrcon/Makefile.orig Tue Apr 19 00:03:18 2016 -+++ hw_utils/hwrcon/Makefile Mon Dec 26 13:16:56 2016 -@@ -47,14 +47,7 @@ endif - # Overrides for the default CPUFLAGS +Index: hw_utils/hwrcon/Makefile +--- hw_utils/hwrcon/Makefile.orig ++++ hw_utils/hwrcon/Makefile +@@ -48,15 +48,6 @@ endif CPUFLAGS=$(CPU_X86) --CFLAGS += -g -Wall + CFLAGS += -Wall -CFLAGS += $(CPUFLAGS) -ifndef DEBUG -CFLAGS += -O2 -DNDEBUG=1 +-else +-CFLAGS += -g -endif - -CPPFLAGS= -LDFLAGS = -+CFLAGS += -Wall # compiler includes INCLUDES= -I. -I$(UHEXEN2_SHARED)