From 79d1f71088a628f167ce744ba88c34bd96254775 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 8 Jan 2021 23:58:29 +0000 Subject: [PATCH] update eduke32 to 9297-2bb6cbcae ok mestre@ Ryan Freeman (MAINTAINER) --- games/eduke32/Makefile | 9 ++++----- games/eduke32/distinfo | 4 ++-- games/eduke32/patches/patch-Common_mak | 14 ++++++++++++-- games/eduke32/patches/patch-GNUmakefile | 18 +++++------------- .../patch-source_audiolib_src_multivoc_cpp | 4 ++-- .../patches/patch-source_audiolib_src_xmp_cpp | 6 +++--- .../patches/patch-source_duke3d_src_game_cpp | 8 ++++---- .../patches/patch-source_duke3d_src_gamevars_h | 17 ----------------- 8 files changed, 32 insertions(+), 48 deletions(-) delete mode 100644 games/eduke32/patches/patch-source_duke3d_src_gamevars_h diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index 3ecf4befe3d..45ccb6b72ec 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.26 2020/04/10 14:59:48 cwen Exp $ +# $OpenBSD: Makefile,v 1.27 2021/01/08 23:58:29 jsg 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 diff --git a/games/eduke32/distinfo b/games/eduke32/distinfo index 0e0cc5542a4..39a9d63ba03 100644 --- a/games/eduke32/distinfo +++ b/games/eduke32/distinfo @@ -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 diff --git a/games/eduke32/patches/patch-Common_mak b/games/eduke32/patches/patch-Common_mak index b0ebbfe3771..dfcca2d11fb 100644 --- a/games/eduke32/patches/patch-Common_mak +++ b/games/eduke32/patches/patch-Common_mak @@ -1,9 +1,9 @@ -$OpenBSD: patch-Common_mak,v 1.2 2019/12/30 08:32:46 jsg Exp $ +$OpenBSD: patch-Common_mak,v 1.3 2021/01/08 23:58:29 jsg Exp $ 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 diff --git a/games/eduke32/patches/patch-GNUmakefile b/games/eduke32/patches/patch-GNUmakefile index 0f4c166b4ab..0638217f950 100644 --- a/games/eduke32/patches/patch-GNUmakefile +++ b/games/eduke32/patches/patch-GNUmakefile @@ -1,9 +1,9 @@ -$OpenBSD: patch-GNUmakefile,v 1.3 2019/12/30 08:32:46 jsg Exp $ +$OpenBSD: patch-GNUmakefile,v 1.4 2021/01/08 23:58:29 jsg Exp $ 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 \ diff --git a/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp b/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp index 0d12f7e25ee..74fb2f9df79 100644 --- a/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp +++ b/games/eduke32/patches/patch-source_audiolib_src_multivoc_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-source_audiolib_src_multivoc_cpp,v 1.1 2019/12/30 08:32:46 jsg Exp $ +$OpenBSD: patch-source_audiolib_src_multivoc_cpp,v 1.2 2021/01/08 23:58:29 jsg Exp $ use packaged libxmp instead of bundled libxmp-lite, works around build issue when libxmp package is installed @@ -13,5 +13,5 @@ Index: source/audiolib/src/multivoc.cpp -# include "libxmp-lite/xmp.h" +# include - int MV_XMPInterpolation = XMP_INTERP_SPLINE; + int MV_XMPInterpolation = XMP_INTERP_NEAREST; #endif diff --git a/games/eduke32/patches/patch-source_audiolib_src_xmp_cpp b/games/eduke32/patches/patch-source_audiolib_src_xmp_cpp index 79fb40899ea..cf5cfc25232 100644 --- a/games/eduke32/patches/patch-source_audiolib_src_xmp_cpp +++ b/games/eduke32/patches/patch-source_audiolib_src_xmp_cpp @@ -1,4 +1,4 @@ -$OpenBSD: patch-source_audiolib_src_xmp_cpp,v 1.1 2019/12/30 08:32:46 jsg Exp $ +$OpenBSD: patch-source_audiolib_src_xmp_cpp,v 1.2 2021/01/08 23:58:29 jsg Exp $ use packaged libxmp instead of bundled libxmp-lite, works around build issue when libxmp package is installed @@ -13,5 +13,5 @@ Index: source/audiolib/src/xmp.cpp -#include "libxmp-lite/xmp.h" +#include - 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); } diff --git a/games/eduke32/patches/patch-source_duke3d_src_game_cpp b/games/eduke32/patches/patch-source_duke3d_src_game_cpp index 197eaa72fab..91472ae1194 100644 --- a/games/eduke32/patches/patch-source_duke3d_src_game_cpp +++ b/games/eduke32/patches/patch-source_duke3d_src_game_cpp @@ -1,13 +1,13 @@ -$OpenBSD: patch-source_duke3d_src_game_cpp,v 1.1 2020/01/04 05:44:39 jsg Exp $ +$OpenBSD: patch-source_duke3d_src_game_cpp,v 1.2 2021/01/08 23:58:29 jsg Exp $ 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); diff --git a/games/eduke32/patches/patch-source_duke3d_src_gamevars_h b/games/eduke32/patches/patch-source_duke3d_src_gamevars_h deleted file mode 100644 index 9a865b417c7..00000000000 --- a/games/eduke32/patches/patch-source_duke3d_src_gamevars_h +++ /dev/null @@ -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: - {