git: 4dc53e36820c - main - games/NBlood: update to 20220802
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 31 Aug 2022 20:20:21 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4dc53e36820cea95b70722dae4abfac08aca8281
commit 4dc53e36820cea95b70722dae4abfac08aca8281
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-08-31 20:03:42 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-08-31 20:03:42 +0000
games/NBlood: update to 20220802
Also fix header collision with newer LLVM.
---
games/NBlood/Makefile | 7 +++++--
games/NBlood/distinfo | 6 +++---
games/NBlood/files/patch-source_build_src_lz4.c | 11 +++++++++++
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/games/NBlood/Makefile b/games/NBlood/Makefile
index a93bce55b20f..29b96004f874 100644
--- a/games/NBlood/Makefile
+++ b/games/NBlood/Makefile
@@ -1,5 +1,5 @@
PORTNAME= NBlood
-DISTVERSION= g20220210
+DISTVERSION= g20220802
CATEGORIES= games
MAINTAINER= pkubaj@FreeBSD.org
@@ -20,7 +20,7 @@ LIB_DEPENDS= libvpx.so:multimedia/libvpx \
USES= compiler:c++14-lang gl gmake pkgconfig sdl
USE_GITHUB= yes
GH_ACCOUNT= nukeykt
-GH_TAGNAME= d2c0ef3
+GH_TAGNAME= 4c3ce1e
USE_GL= glu
USE_SDL= sdl2
@@ -36,6 +36,9 @@ PLIST_FILES= bin/pcexhumed \
MAKE_ARGS+= LTO=0
.endif
+post-patch:
+ ${MV} ${WRKSRC}/source/build/include/lz4.h ${WRKSRC}/source/build/include/my_lz4.h
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pcexhumed ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/nblood ${STAGEDIR}${PREFIX}/bin
diff --git a/games/NBlood/distinfo b/games/NBlood/distinfo
index 09aea702630a..ff00b261224e 100644
--- a/games/NBlood/distinfo
+++ b/games/NBlood/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645058538
-SHA256 (nukeykt-NBlood-g20220210-d2c0ef3_GH0.tar.gz) = 1139d052ad10c1afa4ae961c1ccbb9a3a15948f7b00b89e27e65927ebb653541
-SIZE (nukeykt-NBlood-g20220210-d2c0ef3_GH0.tar.gz) = 42659875
+TIMESTAMP = 1661952280
+SHA256 (nukeykt-NBlood-g20220802-4c3ce1e_GH0.tar.gz) = e50b511f7804a4132cc64a7bf59cd9496e6d9802d528e2aca88e68d345260222
+SIZE (nukeykt-NBlood-g20220802-4c3ce1e_GH0.tar.gz) = 43497014
diff --git a/games/NBlood/files/patch-source_build_src_lz4.c b/games/NBlood/files/patch-source_build_src_lz4.c
new file mode 100644
index 000000000000..b209a53b5433
--- /dev/null
+++ b/games/NBlood/files/patch-source_build_src_lz4.c
@@ -0,0 +1,11 @@
+--- source/build/src/lz4.c.orig 2022-08-31 13:24:58 UTC
++++ source/build/src/lz4.c
+@@ -114,7 +114,7 @@
+ #endif
+
+ #define LZ4_STATIC_LINKING_ONLY /* LZ4_DISTANCE_MAX */
+-#include "lz4.h"
++#include "my_lz4.h"
+ /* see also "memory routines" below */
+
+