Nice, thanks for this. Tested on amd64 just fine against the shareware
data and atomic edition data, played through the first level ok.
OK from me.
-ryan
On Tue, Jan 05, 2021 at 09:21:18PM +1100, Jonathan Gray wrote:
> Tested with Duke3D and Ion Fury.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/eduke32/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile 10 Apr 2020 14:59:48 -0000 1.26
> +++ Makefile 5 Jan 2021 08:36:16 -0000
> @@ -1,11 +1,10 @@
> # $OpenBSD: Makefile,v 1.26 2020/04/10 14:59:48 cwen Exp $
>
> COMMENT = Enhanced Duke Nukem 3D engine
> -RDATE = 20191222
> -RTAG = 8494
> +RDATE = 20201221
> +RTAG = 9297-2bb6cbcae
> DISTNAME = eduke32_src_${RDATE}-${RTAG}
> -PKGNAME = eduke32-2.0.0.${RTAG}
> -REVISION = 0
> +PKGNAME = eduke32-2.0.0.${RTAG:C/-.*$//}
> EXTRACT_SUFX = .tar.xz
> CATEGORIES = games x11
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/eduke32/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 30 Dec 2019 08:32:46 -0000 1.5
> +++ distinfo 5 Jan 2021 08:36:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (eduke32_src_20191222-8494.tar.xz) =
> RaI1M725fVdITdOus9lSZQQspn1R/PfxFpUugWTOcww=
> -SIZE (eduke32_src_20191222-8494.tar.xz) = 15951736
> +SHA256 (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) =
> QkVw0E3G1pdUymv9y1OeAUh/Hci308htJQFATOOvUpQ=
> +SIZE (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) = 19943652
> Index: patches/patch-Common_mak
> ===================================================================
> RCS file: /cvs/ports/games/eduke32/patches/patch-Common_mak,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Common_mak
> --- patches/patch-Common_mak 30 Dec 2019 08:32:46 -0000 1.2
> +++ patches/patch-Common_mak 5 Jan 2021 08:36:16 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Common_mak,v 1.2 2019/12
> Index: Common.mak
> --- Common.mak.orig
> +++ Common.mak
> -@@ -710,7 +710,7 @@ ifeq (0,$(RELEASE))
> +@@ -693,7 +693,7 @@ ifeq (0,$(RELEASE))
> F_NO_STACK_PROTECTOR :=
> else
> ifeq (0,$(CLANG))
> @@ -12,3 +12,13 @@ Index: Common.mak
> endif
>
> ifeq (0,$(FORCEDEBUG))
> +@@ -1017,7 +1017,8 @@ ifeq (,$(VC_HASH))
> + VC_HASH := $(shell git rev-parse --short=9 HEAD 2>&1)
> + endif
> + ifeq (,$(VC_BRANCH))
> +- VC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>&1)
> ++# VC_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>&1)
> ++ VC_BRANCH := master
> + ifneq (master,$(VC_BRANCH))
> + VC_REV := $(VC_REV)[$(VC_BRANCH)]
> + endif
> Index: patches/patch-GNUmakefile
> ===================================================================
> RCS file: /cvs/ports/games/eduke32/patches/patch-GNUmakefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-GNUmakefile
> --- patches/patch-GNUmakefile 30 Dec 2019 08:32:46 -0000 1.3
> +++ patches/patch-GNUmakefile 5 Jan 2021 08:36:16 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-GNUmakefile,v 1.3 2019/1
> Index: GNUmakefile
> --- GNUmakefile.orig
> +++ GNUmakefile
> -@@ -240,7 +240,6 @@ engine_objs := \
> +@@ -222,7 +222,6 @@ engine_objs := \
> hightile.cpp \
> klzw.cpp \
> kplib.cpp \
> @@ -11,7 +11,7 @@ Index: GNUmakefile
> md4.cpp \
> mhk.cpp \
> miniz.c \
> -@@ -403,8 +402,8 @@ ifeq ($(RENDERTYPE),SDL)
> +@@ -387,8 +386,8 @@ ifeq ($(RENDERTYPE),SDL)
> endif
>
> ifneq (0,$(HAVE_XMP))
> @@ -22,7 +22,7 @@ Index: GNUmakefile
> endif
>
>
> -@@ -684,7 +683,7 @@ ifeq ($(SUBPLATFORM),LINUX)
> +@@ -587,7 +586,7 @@ ifeq ($(SUBPLATFORM),LINUX)
> endif
>
> ifeq ($(PLATFORM),BSD)
> @@ -31,7 +31,7 @@ Index: GNUmakefile
> endif
>
> ifeq ($(PLATFORM),DARWIN)
> -@@ -851,13 +850,14 @@ endif
> +@@ -760,13 +759,14 @@ endif
>
> #### Final setup
>
> @@ -47,11 +47,3 @@ Index: GNUmakefile
>
> ifneq (0,$(USE_PHYSFS))
> COMPILERFLAGS += -I$(physfs_inc) -DUSE_PHYSFS
> -@@ -875,7 +875,6 @@ libraries := \
> - audiolib \
> - engine \
> - glad \
> -- libxmplite \
> - lpeg \
> - mact \
> - voidwrap \
> Index: patches/patch-source_audiolib_src_multivoc_cpp
> ===================================================================
> RCS file:
> /cvs/ports/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-source_audiolib_src_multivoc_cpp
> --- patches/patch-source_audiolib_src_multivoc_cpp 30 Dec 2019 08:32:46
> -0000 1.1
> +++ patches/patch-source_audiolib_src_multivoc_cpp 5 Jan 2021 08:36:16
> -0000
> @@ -13,5 +13,5 @@ Index: source/audiolib/src/multivoc.cpp
> -# include "libxmp-lite/xmp.h"
> +# include <xmp.h>
>
> - int MV_XMPInterpolation = XMP_INTERP_SPLINE;
> + int MV_XMPInterpolation = XMP_INTERP_NEAREST;
> #endif
> Index: patches/patch-source_audiolib_src_xmp_cpp
> ===================================================================
> RCS file: /cvs/ports/games/eduke32/patches/patch-source_audiolib_src_xmp_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-source_audiolib_src_xmp_cpp
> --- patches/patch-source_audiolib_src_xmp_cpp 30 Dec 2019 08:32:46 -0000
> 1.1
> +++ patches/patch-source_audiolib_src_xmp_cpp 5 Jan 2021 08:36:16 -0000
> @@ -13,5 +13,5 @@ Index: source/audiolib/src/xmp.cpp
> -#include "libxmp-lite/xmp.h"
> +#include <xmp.h>
>
> - typedef struct {
> - void * ptr;
> + int MV_GetXMPPosition(VoiceNode *voice) { return
> voice->position; }
> + void MV_SetXMPPosition(VoiceNode *voice, int position) {
> xmp_seek_time((xmp_context)voice->rawdataptr, position); }
> Index: patches/patch-source_duke3d_src_game_cpp
> ===================================================================
> RCS file: /cvs/ports/games/eduke32/patches/patch-source_duke3d_src_game_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-source_duke3d_src_game_cpp
> --- patches/patch-source_duke3d_src_game_cpp 4 Jan 2020 05:44:39 -0000
> 1.1
> +++ patches/patch-source_duke3d_src_game_cpp 5 Jan 2021 08:36:17 -0000
> @@ -5,9 +5,9 @@ store log file in ~/.config/eduke32/
> Index: source/duke3d/src/game.cpp
> --- source/duke3d/src/game.cpp.orig
> +++ source/duke3d/src/game.cpp
> -@@ -6367,6 +6367,9 @@ EDUKE32_STATIC_ASSERT(sizeof(DukePlayer_t)%4 == 0);
> +@@ -6384,6 +6384,9 @@ void G_DrawFrame(void)
>
> - int app_main(int argc, char const * const * argv)
> + int app_main(int argc, char const* const* argv)
> {
> + char logpath[BMAX_PATH];
> + char *homedir;
> @@ -15,7 +15,7 @@ Index: source/duke3d/src/game.cpp
> #ifndef NETCODE_DISABLE
> if (enet_initialize() != 0)
> initprintf("An error occurred while initializing ENet.\n");
> -@@ -6397,21 +6400,22 @@ int app_main(int argc, char const * const * argv)
> +@@ -6410,21 +6413,22 @@ int app_main(int argc, char const* const* argv)
>
> G_ExtPreInit(argc, argv);
>
> Index: patches/patch-source_duke3d_src_gamevars_h
> ===================================================================
> RCS file: patches/patch-source_duke3d_src_gamevars_h
> diff -N patches/patch-source_duke3d_src_gamevars_h
> --- patches/patch-source_duke3d_src_gamevars_h 30 Dec 2019 08:32:46
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-source_duke3d_src_gamevars_h,v 1.1 2019/12/30 08:32:46 jsg
> Exp $
> -
> -fix clang build
> -http://svn.eduke32.com/comp.php?repname=eduke32&compare[]=/@8494&compare[]=/@8495
> -
> -Index: source/duke3d/src/gamevars.h
> ---- source/duke3d/src/gamevars.h.orig
> -+++ source/duke3d/src/gamevars.h
> -@@ -252,7 +252,7 @@ static FORCE_INLINE void __fastcall Gv_DivVar(int cons
> - {
> - case GAMEVAR_PERACTOR: iptr = &var.pValues[vm.spriteNum &
> (MAXSPRITES-1)]; goto jmp;
> - case GAMEVAR_PERPLAYER: iptr = &var.pValues[vm.playerNum &
> (MAXPLAYERS-1)]; fallthrough__;
> -- jmp: default: *iptr = libdivide_s32_do(*iptr, dptr); break;
> -+ default: jmp: *iptr = libdivide_s32_do(*iptr, dptr); break;
> -
> - case GAMEVAR_INT32PTR:
> - {
