haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

eduke32, fix _x86 build, bump git checkout (#3964)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-08-10 17:48:50 +02:00
committed by waddlesplash
parent 540ba8daba
commit da2e32fd3e
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
games-fps/eduke32/eduke32-20181118_7241.recipe → games-fps/eduke32/eduke32-20190304_7392.recipe
View File

@@ -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()

25
games-fps/eduke32/patches/eduke32-20181118_7241.patchset → games-fps/eduke32/patches/eduke32-20190304_7392.patchset
View File

@@ -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?= <zmizsei@extrowerk.com>
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 <dirent.h>
+#endif
+
#include "vfs.h"
#if !defined(_WIN32)
# include <dirent.h>
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