cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update nblood to a newer snapshot

Browse Source
This commit is contained in:
jsg 2021-01-06 03:26:04 +00:00
parent 03093e7127
commit 740c3adf98
9 changed files with 109 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
games/nblood/Makefile
View File

@ -1,14 +1,20 @@
# $OpenBSD: Makefile,v 1.5 2020/04/08 22:41:18 cwen Exp $
# $OpenBSD: Makefile,v 1.6 2021/01/06 03:26:04 jsg Exp $
COMMENT = reverse-engineered ports of Build games
DISTNAME = nblood-1.01.20200313
DISTNAME = nblood-1.01.20210103
GH_ACCOUNT = nukeykt
GH_PROJECT = NBlood
GH_COMMIT = 369b790af785c9a0f144dfa9e82bda87af48da7a
GH_COMMIT = edc76dee4d1eb9ee9ae7b8be5bf0ce371a91d1e3
CATEGORIES = games x11
VC_BRANCH = master
# git rev-list --count hash
VC_REV = 12112
# git rev-parse --short=9 hash
VC_HASH = edc76dee4
MAINTAINER = Jonathan Gray <jsg@openbsd.org>
# GPLv2, BUILD license and shareware data
@ -66,6 +72,11 @@ post-extract:
${WRKSRC}/source/blood/src/common.cpp
rm ${WRKSRC}/source/build/include/lz4.h ${WRKSRC}/source/build/src/lz4.c
post-patch:
echo "VC_BRANCH := ${VC_BRANCH}" > ${WRKSRC}/EDUKE32_REVISION.mak
echo "VC_REV := ${VC_REV}" >> ${WRKSRC}/EDUKE32_REVISION.mak
echo "VC_HASH := ${VC_HASH}" >> ${WRKSRC}/EDUKE32_REVISION.mak
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/nblood ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKBUILD}/rednukem ${PREFIX}/bin

4
games/nblood/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nblood-1.01.20200313-369b790a.tar.gz) = jTXuqdwXD/sA/YvhTnB+TQwnieqvHYh5zaBuyp/ZAtU=
SIZE (nblood-1.01.20200313-369b790a.tar.gz) = 50159205
SHA256 (nblood-1.01.20210103-edc76dee.tar.gz) = 8Ju/hxg+qOr843zWJX0o8Q4hTurkLVUw5EbH3MgpFUs=
SIZE (nblood-1.01.20210103-edc76dee.tar.gz) = 42480972

4
games/nblood/patches/patch-Common_mak
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Common_mak,v 1.2 2020/03/14 06:15:15 jsg Exp $
$OpenBSD: patch-Common_mak,v 1.3 2021/01/06 03:26:04 jsg Exp $
Index: Common.mak
--- Common.mak.orig
+++ Common.mak
@@ -715,7 +715,7 @@ ifeq (0,$(RELEASE))
@@ -695,7 +695,7 @@ ifeq (0,$(RELEASE))
F_NO_STACK_PROTECTOR :=
else
ifeq (0,$(CLANG))

16
games/nblood/patches/patch-GNUmakefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-GNUmakefile,v 1.2 2020/03/14 06:15:15 jsg Exp $
$OpenBSD: patch-GNUmakefile,v 1.3 2021/01/06 03:26:04 jsg Exp $
Index: GNUmakefile
--- GNUmakefile.orig
+++ GNUmakefile
@@ -260,7 +260,6 @@ engine_objs := \
@@ -258,7 +258,6 @@ engine_objs := \
hightile.cpp \
klzw.cpp \
kplib.cpp \
@ -22,7 +22,7 @@ Index: GNUmakefile
endif
@@ -704,7 +703,7 @@ ifeq ($(SUBPLATFORM),LINUX)
@@ -688,7 +687,7 @@ ifeq ($(SUBPLATFORM),LINUX)
endif
ifeq ($(PLATFORM),BSD)
@ -31,7 +31,7 @@ Index: GNUmakefile
endif
ifeq ($(PLATFORM),DARWIN)
@@ -1240,7 +1239,7 @@ endif
@@ -1306,7 +1305,7 @@ endif
#### Final setup
@ -40,19 +40,19 @@ Index: GNUmakefile
-I$(engine_inc) \
-I$(mact_inc) \
-I$(audiolib_inc) \
@@ -1248,6 +1247,7 @@ COMPILERFLAGS += \
-I$(voidwrap_inc) \
@@ -1315,6 +1314,7 @@ COMPILERFLAGS += \
-I$(libsmackerdec_inc) \
-I$(hmpplay_inc) \
-MP -MMD \
+ $(COMPILERFLAGS)
ifneq (0,$(USE_PHYSFS))
COMPILERFLAGS += -I$(physfs_inc) -DUSE_PHYSFS
@@ -1268,7 +1268,6 @@ libraries := \
@@ -1340,7 +1340,6 @@ libraries := \
audiolib \
engine \
glad \
- libxmplite \
lpeg \
mact \
voidwrap \
libsmackerdec \

4
games/nblood/patches/patch-source_audiolib_src_multivoc_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-source_audiolib_src_multivoc_cpp,v 1.1.1.1 2020/01/01 02:28:07 jsg Exp $
$OpenBSD: patch-source_audiolib_src_multivoc_cpp,v 1.2 2021/01/06 03:26:04 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 <xmp.h>
int MV_XMPInterpolation = XMP_INTERP_SPLINE;
int MV_XMPInterpolation = XMP_INTERP_NEAREST;
#endif

6
games/nblood/patches/patch-source_audiolib_src_xmp_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-source_audiolib_src_xmp_cpp,v 1.1.1.1 2020/01/01 02:28:07 jsg Exp $
$OpenBSD: patch-source_audiolib_src_xmp_cpp,v 1.2 2021/01/06 03:26:04 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 <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); }

54
games/nblood/patches/patch-source_blood_src_blood_cpp
View File

@ -1,41 +1,37 @@
$OpenBSD: patch-source_blood_src_blood_cpp,v 1.3 2020/03/14 06:15:15 jsg Exp $
$OpenBSD: patch-source_blood_src_blood_cpp,v 1.4 2021/01/06 03:26:04 jsg Exp $
store log file in ~/.config/nblood/
Index: source/blood/src/blood.cpp
--- source/blood/src/blood.cpp.orig
+++ source/blood/src/blood.cpp
@@ -1505,6 +1505,9 @@ static int32_t check_filename_casing(void)
int app_main(int argc, char const * const * argv)
{
char buffer[BMAX_PATH];
+ char logpath[BMAX_PATH];
+ char *homedir;
+ int r;
margc = argc;
margv = argv;
#ifdef _WIN32
@@ -1531,7 +1534,22 @@ int app_main(int argc, char const * const * argv)
#endif
#endif
- OSD_SetLogFile(APPBASENAME ".log");
+ homedir = Bgethomedir();
+ if (!g_useCwd && homedir != NULL)
@@ -1555,6 +1555,29 @@ int app_main(int argc, char const * const * argv)
Xfree(homedir);
}
else
+#else
+ if (!g_useCwd)
+ {
+ Bsnprintf(logpath, sizeof(logpath), "%s/.config/%s", homedir, APPBASENAME);
+ r = Bmkdir(logpath, S_IRWXU);
+ if (r == 0 || (r == -1 && errno == EEXIST))
+ char cwd[BMAX_PATH];
+ char *homedir = Bgethomedir();
+ int r;
+ if (homedir)
+ {
+ Bsnprintf(logpath, sizeof(logpath), "%s/.config/%s/%s.log", homedir, APPBASENAME, APPBASENAME);
+ OSD_SetLogFile(logpath);
+ Bsnprintf(cwd, sizeof(cwd), "%s/.config/%s", homedir, APPBASENAME);
+ r = Bmkdir(cwd, S_IRWXU);
+ if (r == 0 || (r == -1 && errno == EEXIST)) {
+ Bsnprintf(cwd, sizeof(cwd), "%s/.config/%s/%s.log",
+ homedir, APPBASENAME, APPBASENAME);
+ } else {
+ Bstrcpy(cwd, APPBASENAME ".log");
+ }
+ } else {
+ Bstrcpy(cwd, APPBASENAME ".log");
+ }
+ else
+ OSD_SetLogFile(APPBASENAME ".log");
+ OSD_SetLogFile(cwd);
+ Xfree(homedir);
+ }
+ else
+ OSD_SetLogFile(APPBASENAME ".log");
+ Bfree(homedir);
#endif
OSD_SetLogFile(APPBASENAME ".log");
OSD_SetFunctions(NULL,
NULL,

54
games/nblood/patches/patch-source_exhumed_src_exhumed_cpp
View File

@ -1,41 +1,37 @@
$OpenBSD: patch-source_exhumed_src_exhumed_cpp,v 1.3 2020/03/14 06:15:15 jsg Exp $
$OpenBSD: patch-source_exhumed_src_exhumed_cpp,v 1.4 2021/01/06 03:26:04 jsg Exp $
store log file in ~/.config/pcexhumed/
Index: source/exhumed/src/exhumed.cpp
--- source/exhumed/src/exhumed.cpp.orig
+++ source/exhumed/src/exhumed.cpp
@@ -2228,6 +2228,9 @@ static int32_t nonsharedtimer;
int app_main(int argc, char const* const* argv)
{
char tempbuf[256];
+ char logpath[BMAX_PATH];
+ char *homedir;
+ int r;
#ifdef _WIN32
#ifndef DEBUGGINGAIDS
if (!G_CheckCmdSwitch(argc, argv, "-noinstancechecking") && !windowsCheckAlreadyRunning())
@@ -2252,7 +2255,22 @@ int app_main(int argc, char const* const* argv)
G_ExtPreInit(argc, argv);
- OSD_SetLogFile(APPBASENAME ".log");
+ homedir = Bgethomedir();
+ if (!g_useCwd && homedir != NULL)
@@ -1868,6 +1868,29 @@ int app_main(int argc, char const* const* argv)
Xfree(homedir);
}
else
+#else
+ if (!g_useCwd)
+ {
+ Bsnprintf(logpath, sizeof(logpath), "%s/.config/%s", homedir, APPBASENAME);
+ r = Bmkdir(logpath, S_IRWXU);
+ if (r == 0 || (r == -1 && errno == EEXIST))
+ char cwd[BMAX_PATH];
+ char *homedir = Bgethomedir();
+ int r;
+ if (homedir)
+ {
+ Bsnprintf(logpath, sizeof(logpath), "%s/.config/%s/%s.log", homedir, APPBASENAME, APPBASENAME);
+ OSD_SetLogFile(logpath);
+ Bsnprintf(cwd, sizeof(cwd), "%s/.config/%s", homedir, APPBASENAME);
+ r = Bmkdir(cwd, S_IRWXU);
+ if (r == 0 || (r == -1 && errno == EEXIST)) {
+ Bsnprintf(cwd, sizeof(cwd), "%s/.config/%s/%s.log",
+ homedir, APPBASENAME, APPBASENAME);
+ } else {
+ Bstrcpy(cwd, APPBASENAME ".log");
+ }
+ } else {
+ Bstrcpy(cwd, APPBASENAME ".log");
+ }
+ else
+ OSD_SetLogFile(APPBASENAME ".log");
+ OSD_SetLogFile(cwd);
+ Xfree(homedir);
+ }
+ else
+ OSD_SetLogFile(APPBASENAME ".log");
+ Bfree(homedir);
#endif
OSD_SetLogFile(APPBASENAME ".log");
OSD_SetFunctions(NULL,
NULL,

70
games/nblood/patches/patch-source_rr_src_game_cpp
View File

@ -1,51 +1,37 @@
$OpenBSD: patch-source_rr_src_game_cpp,v 1.3 2020/03/14 06:15:15 jsg Exp $
$OpenBSD: patch-source_rr_src_game_cpp,v 1.4 2021/01/06 03:26:04 jsg Exp $
store log file in ~/.config/rednukem/
Index: source/rr/src/game.cpp
--- source/rr/src/game.cpp.orig
+++ source/rr/src/game.cpp
@@ -7832,6 +7832,9 @@ EDUKE32_STATIC_ASSERT(sizeof(DukePlayer_t)%4 == 0);
int app_main(int argc, char const * const * argv)
{
+ char logpath[BMAX_PATH];
+ char *homedir;
+ int r;
#ifndef NETCODE_DISABLE
if (enet_initialize() != 0)
initprintf("An error occurred while initializing ENet.\n");
@@ -7862,21 +7865,22 @@ int app_main(int argc, char const * const * argv)
G_ExtPreInit(argc, argv);
-#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);
- Bfree(homedir);
+ OSD_SetLogFile(APPBASENAME ".log");
@@ -8161,6 +8161,29 @@ int app_main(int argc, char const * const * argv)
Bfree(homedir);
}
else
-#endif
- OSD_SetLogFile(APPBASENAME ".log");
+ OSD_SetLogFile(APPBASENAME ".log");
+ Bfree(homedir);
+#else
+ if (!g_useCwd)
+ {
+ char cwd[BMAX_PATH];
+ char *homedir = Bgethomedir();
+ int r;
+ if (homedir)
+ {
+ Bsnprintf(cwd, sizeof(cwd), "%s/.config/%s", homedir, APPBASENAME);
+ r = Bmkdir(cwd, S_IRWXU);
+ if (r == 0 || (r == -1 && errno == EEXIST)) {
+ Bsnprintf(cwd, sizeof(cwd), "%s/.config/%s/%s.log",
+ homedir, APPBASENAME, APPBASENAME);
+ } else {
+ Bstrcpy(cwd, APPBASENAME ".log");
+ }
+ } else {
+ Bstrcpy(cwd, APPBASENAME ".log");
+ }
+ OSD_SetLogFile(cwd);
+ Xfree(homedir);
+ }
+ else
#endif
OSD_SetLogFile(APPBASENAME ".log");
OSD_SetFunctions(GAME_drawosdchar,
GAME_drawosdstr,