From da2e32fd3e60411782aeb522c6e0d44889ca69b6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 10 Aug 2019 17:48:50 +0200 Subject: [PATCH] eduke32, fix _x86 build, bump git checkout (#3964) --- ...41.recipe => eduke32-20190304_7392.recipe} | 12 ++++----- ...atchset => eduke32-20190304_7392.patchset} | 25 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) rename games-fps/eduke32/{eduke32-20181118_7241.recipe => eduke32-20190304_7392.recipe} (93%) rename games-fps/eduke32/patches/{eduke32-20181118_7241.patchset => eduke32-20190304_7392.patchset} (88%) diff --git a/games-fps/eduke32/eduke32-20181118_7241.recipe b/games-fps/eduke32/eduke32-20190304_7392.recipe similarity index 93% rename from games-fps/eduke32/eduke32-20181118_7241.recipe rename to games-fps/eduke32/eduke32-20190304_7392.recipe index 8cb79e73d..bb1fbcd07 100644 --- a/games-fps/eduke32/eduke32-20181118_7241.recipe +++ b/games-fps/eduke32/eduke32-20190304_7392.recipe @@ -36,7 +36,7 @@ LICENSE="GNU GPL v2 Build_Engine" REVISION="1" SOURCE_URI="http://dukeworld.com/eduke32/synthesis/${portVersion/_/-}/eduke32_src_${portVersion/_/-}.tar.xz" -CHECKSUM_SHA256="7c2dac1e540c7c39d24f08a3646a71b3290b74ea7e61abd61e6b6a0c5ec74f86" +CHECKSUM_SHA256="3f5ceb08ffde091c2cca6d88710e0796126faa5ff6975ce059498b3faf645c42" SOURCE_DIR="eduke32_${portVersion/_/-}" PATCHES="eduke32-$portVersion.patchset" @@ -56,8 +56,8 @@ REQUIRES=" lib:libGLU$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libpng16$secondaryArchSuffix - lib:libsdl2_2.0$secondaryArchSuffix - lib:libsdl2_mixer_2.0$secondaryArchSuffix + lib:libSDL2_2.0$secondaryArchSuffix + lib:libSDL2_mixer_2.0$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix lib:libvpx$secondaryArchSuffix @@ -72,8 +72,8 @@ BUILD_REQUIRES=" devel:libGLU$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libsdl2_2.0$secondaryArchSuffix - devel:libsdl2_mixer_2.0$secondaryArchSuffix + devel:libSDL2$secondaryArchSuffix + devel:libSDL2_mixer$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix devel:libvpx$secondaryArchSuffix @@ -96,7 +96,7 @@ defineDebugInfoPackage eduke32$secondaryArchSuffix \ BUILD() { make $jobArgs \ - RELEASE=1 + RELEASE=1 HAVE_XMP=0 } INSTALL() diff --git a/games-fps/eduke32/patches/eduke32-20181118_7241.patchset b/games-fps/eduke32/patches/eduke32-20190304_7392.patchset similarity index 88% rename from games-fps/eduke32/patches/eduke32-20181118_7241.patchset rename to games-fps/eduke32/patches/eduke32-20190304_7392.patchset index ba0a3b018..320e183f5 100644 --- a/games-fps/eduke32/patches/eduke32-20181118_7241.patchset +++ b/games-fps/eduke32/patches/eduke32-20190304_7392.patchset @@ -1,11 +1,11 @@ -From 30766ce45418158d4f477b4f8d28a9d3705e240e Mon Sep 17 00:00:00 2001 +From b308ed6fff234687d0849e60f88915b172b73eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sun, 25 Feb 2018 11:10:26 +0100 Subject: Haiku supporting patches diff --git a/Common.mak b/Common.mak -index d84272f..7fea56d 100644 +index 5bc9aa5..0474ead 100644 --- a/Common.mak +++ b/Common.mak @@ -33,6 +33,8 @@ ifndef HOSTPLATFORM @@ -17,7 +17,7 @@ index d84272f..7fea56d 100644 else ifeq ($(findstring skyos,$(uname)),skyos) HOSTPLATFORM := SKYOS else ifeq ($(findstring QNX,$(uname)),QNX) -@@ -959,17 +961,23 @@ else ifeq ($(SUBPLATFORM),LINUX) +@@ -969,17 +971,22 @@ else ifeq ($(SUBPLATFORM),LINUX) LIBS += -lrt endif @@ -43,15 +43,14 @@ index d84272f..7fea56d 100644 +ifeq ($(PLATFORM),HAIKU) + LIBS+= -lnetwork +endif -+ ##### Detect version control revision, if applicable diff --git a/GNUmakefile b/GNUmakefile -index d9ef931..f66a874 100644 +index c0e9af3..1767008 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -614,6 +614,10 @@ ifeq ($(PLATFORM),BSD) +@@ -655,6 +655,10 @@ ifeq ($(PLATFORM),BSD) LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo endif @@ -63,7 +62,7 @@ index d9ef931..f66a874 100644 LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \ -Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \ diff --git a/source/build/include/compat.h b/source/build/include/compat.h -index 38c479a..51e058c 100644 +index 4d3d90a..543c295 100644 --- a/source/build/include/compat.h +++ b/source/build/include/compat.h @@ -342,7 +342,7 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 || @@ -76,7 +75,7 @@ index 38c479a..51e058c 100644 # if LITTLE_ENDIAN != 0 # define B_LITTLE_ENDIAN 1 diff --git a/source/build/src/kplib.cpp b/source/build/src/kplib.cpp -index 5ec453d..1c71477 100644 +index 78aaca2..3c51680 100644 --- a/source/build/src/kplib.cpp +++ b/source/build/src/kplib.cpp @@ -34,6 +34,10 @@ credits. @@ -87,10 +86,10 @@ index 5ec453d..1c71477 100644 +#include +#endif + + #include "vfs.h" + #if !defined(_WIN32) - # include - static FORCE_INLINE CONSTEXPR int32_t klrotl(int32_t i, int sh) { return (i >> (-sh)) | (i << sh); } -@@ -2757,14 +2761,14 @@ int32_t kzfindfile(char *filnam) +@@ -2752,14 +2756,14 @@ int32_t kzfindfile(char *filnam) if ((findata = readdir(hfind)) == NULL) { closedir(hfind); hfind = NULL; if (!kzhashbuf) return 0; srchstat = 2; break; } i = wildstpathleng; @@ -114,10 +113,10 @@ index 5ec453d..1c71477 100644 return 1; } diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp -index 5dc0317..9240204 100644 +index 3482893..d55e695 100644 --- a/source/duke3d/src/common.cpp +++ b/source/duke3d/src/common.cpp -@@ -320,6 +320,8 @@ void G_ExtInit(void) +@@ -327,6 +327,8 @@ void G_ExtInit(void) APPNAME #elif defined(GEKKO) "apps/" APPBASENAME