update eduke32 to 9511-d032a9949 and build voidsw for shadow warrior

ok Ryan Freeman (MAINTAINER)
2021-08-20 11:20:38 +00:00 · 2021-08-20 11:20:38 +00:00 · df7d223cbb
commit df7d223cbb
parent 36d6b34259
7 changed files with 104 additions and 16 deletions
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.28 2021/06/09 19:50:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2021/08/20 11:20:38 jsg Exp $

 COMMENT =	Enhanced Duke Nukem 3D engine
-RDATE =		20201221
-RTAG =		9297-2bb6cbcae
+RDATE =		20210816
+RTAG =		9511-d032a9949
 DISTNAME =	eduke32_src_${RDATE}-${RTAG}
 PKGNAME =	eduke32-2.0.0.${RTAG:C/-.*$//}
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	games x11

-REVISION =	0
-
 HOMEPAGE =	https://www.eduke32.com/

 MAINTAINER =	Ryan Freeman <ryan@slipgate.org>
@ -74,6 +72,7 @@ post-extract:

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/eduke32 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/voidsw ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKBUILD}/mapster32 ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/duke3d
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/eduke32
--- a/games/eduke32/distinfo
+++ b/games/eduke32/distinfo
@ -1,2 +1,2 @@
-SHA256 (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) = QkVw0E3G1pdUymv9y1OeAUh/Hci308htJQFATOOvUpQ=
-SIZE (eduke32_src_20201221-9297-2bb6cbcae.tar.xz) = 19943652
+SHA256 (eduke32_src_20210816-9511-d032a9949.tar.xz) = 0CETakhMkcJhfoVez2GK/G68cp7w8Wq2/6gEWhC1HoA=
+SIZE (eduke32_src_20210816-9511-d032a9949.tar.xz) = 20099904
--- a/games/eduke32/patches/patch-Common_mak
+++ b/games/eduke32/patches/patch-Common_mak
@ -1,9 +1,29 @@
-$OpenBSD: patch-Common_mak,v 1.3 2021/01/08 23:58:29 jsg Exp $
+$OpenBSD: patch-Common_mak,v 1.4 2021/08/20 11:20:38 jsg Exp $

 Index: Common.mak
 --- Common.mak.orig
 +++ Common.mak
-@@ -693,7 +693,7 @@ ifeq (0,$(RELEASE))
+@@ -188,9 +188,6 @@ ifeq ($(PLATFORM),WII)
+     CCFULLPATH = $(DEVKITPPC)/bin/$(CC)
+ endif
+ 
+-CC := $(CROSS)gcc$(CROSS_SUFFIX)
+-CXX := $(CROSS)g++$(CROSS_SUFFIX)
+-
+ ifeq ($(PLATFORM),DARWIN)
+     CC := $(CROSS)clang$(CROSS_SUFFIX)
+     CXX := $(CROSS)clang++$(CROSS_SUFFIX)
+@@ -213,9 +210,6 @@ PKG_CONFIG := pkg-config
+ ELF2DOL := elf2dol
+ 
+ # Override defaults that absolutely will not work.
+-ifeq ($(CC),cc)
+-    override CC := gcc
+-endif
+ ifeq ($(AS),as)
+     override AS := nasm
+ endif
+@@ -693,7 +687,7 @@ ifeq (0,$(RELEASE))
     F_NO_STACK_PROTECTOR :=
 else
     ifeq (0,$(CLANG))
@ -12,7 +32,16 @@ Index: Common.mak
     endif
 
     ifeq (0,$(FORCEDEBUG))
-@@ -1017,7 +1017,8 @@ ifeq (,$(VC_HASH))
+@@ -722,7 +716,7 @@ W_UNINITIALIZED := -Wuninitialized
+ W_GCC_4_1 := -Wno-attributes
+ W_GCC_4_2 := $(W_STRICT_OVERFLOW)
+ W_GCC_4_4 := -Wno-unused-result
+-W_GCC_4_5 := -Wlogical-op -Wcast-qual
+W_GCC_4_5 := -Wcast-qual
+ W_GCC_6 := -Wduplicated-cond -Wnull-dereference
+ W_GCC_7 := -Wduplicated-branches
+ W_GCC_8 := -Warray-bounds=2
+@@ -1014,7 +1008,8 @@ ifeq (,$(VC_HASH))
     VC_HASH := $(shell git rev-parse --short=9 HEAD 2>&1)
 endif
 ifeq (,$(VC_BRANCH))
--- a/games/eduke32/patches/patch-GNUmakefile
+++ b/games/eduke32/patches/patch-GNUmakefile
@ -1,4 +1,4 @@
-$OpenBSD: patch-GNUmakefile,v 1.4 2021/01/08 23:58:29 jsg Exp $
+$OpenBSD: patch-GNUmakefile,v 1.5 2021/08/20 11:20:38 jsg Exp $

 Index: GNUmakefile
 --- GNUmakefile.orig
@ -47,3 +47,12 @@ Index: GNUmakefile
 
 ifneq (0,$(USE_PHYSFS))
     COMPILERFLAGS += -I$(physfs_inc) -DUSE_PHYSFS
+@@ -826,7 +826,7 @@ endif
+ 
+ #### Targets
+ 
+-all: duke3d
+all: duke3d sw
+ 
+ start:
+ 	$(BUILD_STARTED)
--- a/games/eduke32/patches/patch-source_duke3d_src_game_cpp
+++ b/games/eduke32/patches/patch-source_duke3d_src_game_cpp
@ -1,11 +1,11 @@
-$OpenBSD: patch-source_duke3d_src_game_cpp,v 1.2 2021/01/08 23:58:29 jsg Exp $
+$OpenBSD: patch-source_duke3d_src_game_cpp,v 1.3 2021/08/20 11:20:38 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
-@@ -6384,6 +6384,9 @@ void G_DrawFrame(void)
+@@ -6323,6 +6323,9 @@ void G_DrawFrame(void)
 
 int app_main(int argc, char const* const* argv)
 {
@ -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");
-@@ -6410,21 +6413,22 @@ int app_main(int argc, char const* const* argv)
+@@ -6349,21 +6352,22 @@ int app_main(int argc, char const* const* argv)
 
     G_ExtPreInit(argc, argv);
 
--- a/games/eduke32/patches/patch-source_sw_src_game_cpp
+++ b/games/eduke32/patches/patch-source_sw_src_game_cpp
@ -0,0 +1,51 @@
+$OpenBSD: patch-source_sw_src_game_cpp,v 1.1 2021/08/20 11:20:38 jsg Exp $
+
+store log file in ~/.config/voidsw/
+
+Index: source/sw/src/game.cpp
+--- source/sw/src/game.cpp.orig
+++ source/sw/src/game.cpp
+@@ -3393,6 +3393,9 @@ void CommandLineHelp(char const * const * argv)
+ 
+ int32_t app_main(int32_t argc, char const * const * argv)
+ {
+    char logpath[BMAX_PATH];
+    char *homedir;
+    int r;
+     int i;
+     extern int MovesPerPacket;
+     void DoSector(void);
+@@ -3457,21 +3460,22 @@ int32_t app_main(int32_t argc, char const * const * ar
+     }
+ #endif
+ 
+-#ifdef __APPLE__
+-    if (!g_useCwd)
+    homedir = Bgethomedir();
+    if (!g_useCwd && homedir != NULL)
+     {
+-        char cwd[BMAX_PATH];
+-        char *homedir = Bgethomedir();
+-        if (homedir)
+-            Bsnprintf(cwd, sizeof(cwd), "%s/Library/Logs/" APPBASENAME ".log", homedir);
+        Bsnprintf(logpath, sizeof(logpath), "%s/.config/%s", homedir, APPBASENAME);
+        r = Bmkdir(logpath, S_IRWXU);
+        if (r == 0 || (r == -1 && errno == EEXIST))
+        {
+            Bsnprintf(logpath, sizeof(logpath), "%s/.config/%s/%s.log", homedir, APPBASENAME, APPBASENAME);
+            OSD_SetLogFile(logpath);
+        }
+         else
+-            Bstrcpy(cwd, APPBASENAME ".log");
+-        OSD_SetLogFile(cwd);
+-        Xfree(homedir);
+            OSD_SetLogFile(APPBASENAME ".log");
+     }
+     else
+-#endif
+-    OSD_SetLogFile(APPBASENAME ".log");
+        OSD_SetLogFile(APPBASENAME ".log");
+    Bfree(homedir);
+ 
+     wm_setapptitle(APPNAME);
+ 
--- a/games/eduke32/pkg/PLIST
+++ b/games/eduke32/pkg/PLIST
@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.5 2019/12/30 08:32:46 jsg Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/08/20 11:20:38 jsg Exp $
@bin bin/eduke32
@bin bin/mapster32
+@bin bin/voidsw
 share/doc/eduke32/
 share/doc/eduke32/buildlic.txt
 share/doc/eduke32/gpl-2.0.txt
 share/doc/pkg-readmes/${PKGSTEM}
-share/duke3d/
 share/duke3d/SEHELP.HLP
 share/duke3d/STHELP.HLP
 share/duke3d/m32help.hlp