Eduke32: new recipe (#1388)

2026-05-04 22:18:55 +02:00 · 2017-06-05 13:00:50 +02:00
parent c9c433fc9b
commit d246633d9c
2 changed files with 268 additions and 0 deletions
--- a/games-fps/eduke32/patches/eduke32-20170518_6135.patchset
+++ b/games-fps/eduke32/patches/eduke32-20170518_6135.patchset
@@ -0,0 +1,166 @@
+From a6cd111118bb90838cd5a4c02a0751717d610d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 3 Jun 2017 16:02:01 +0200
+Subject: Haiku: endiannes fix
+
+
+diff --git a/source/build/include/compat.h b/source/build/include/compat.h
+index 035fdc1..9a34a6b 100644
+--- a/source/build/include/compat.h
+++ b/source/build/include/compat.h
+@@ -279,7 +279,7 @@ defined __x86_64__ || defined __amd64__ || defined _M_X64 || defined _M_IA64 ||
+ # endif
+ # include <libkern/OSByteOrder.h>
+
+-#elif defined(__BEOS__)
+#elif defined(__BEOS__) || defined(__HAIKU__)
+ # include <posix/endian.h>
+ # if LITTLE_ENDIAN != 0
+ #  define B_LITTLE_ENDIAN 1
+--
+2.12.2
+
+
+From 71dc7c0d342f07766cb4ee4ce04b080bf1e32b61 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 3 Jun 2017 17:31:49 +0200
+Subject: Haiku: build fix
+
+
+diff --git a/source/build/src/kplib.cpp b/source/build/src/kplib.cpp
+index 601892d..c0c3e77 100644
+--- a/source/build/src/kplib.cpp
+++ b/source/build/src/kplib.cpp
+@@ -34,6 +34,10 @@ credits.
+ #include "kplib.h"
+ #include "pragmas.h"
+
+#ifdef __HAIKU__
+#include <dirent.h>
+#endif
+
+ #if !defined(_WIN32)
+ #include <dirent.h>
+ static inline int32_t _lrotl(int32_t i, int sh) { return (i >> (-sh)) | (i << sh); }
+@@ -2759,14 +2763,14 @@ int32_t kzfindfile(char *filnam)
+             if ((findata = readdir(hfind)) == NULL)
+                 { closedir(hfind); hfind = NULL; if (!kzhashbuf) return 0; srchstat = 2; break; }
+             i = wildstpathleng;
+-            if (findata->d_type == DT_DIR)
+-                { if (findata->d_name[0] == '.' && !findata->d_name[1]) continue; } //skip .
+-            else if ((findata->d_type == DT_REG) || (findata->d_type == DT_LNK))
+-                { if (findata->d_name[0] == '.') continue; } //skip hidden (dot) files
+-            else continue; //skip devices and fifos and such
+-            if (!wildmatch(findata->d_name,&newildst[wildstpathleng])) continue;
+-            strcpy(&filnam[i],findata->d_name);
+-            if (findata->d_type == DT_DIR) strcat(&filnam[i],"/");
+//            if (findata->d_type == DT_DIR)
+//                { if (findata->d_name[0] == '.' && !findata->d_name[1]) continue; } //skip .
+//            else if ((findata->d_type == DT_REG) || (findata->d_type == DT_LNK))
+//                { if (findata->d_name[0] == '.') continue; } //skip hidden (dot) files
+//            else continue; //skip devices and fifos and such
+//            if (!wildmatch(findata->d_name,&newildst[wildstpathleng])) continue;
+//            strcpy(&filnam[i],findata->d_name);
+//            if (findata->d_type == DT_DIR) strcat(&filnam[i],"/");
+ #endif
+             return 1;
+         }
+--
+2.12.2
+
+From 537ab2e7986ff33d27056ec0c1a3018b9fe28eaa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sun, 4 Jun 2017 08:04:43 +0200
+Subject: [PATCH] Platform specific fixes
+
+---
+ Common.mak  | 22 +++++++++++++++-------
+ GNUmakefile |  4 ++++
+ 2 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/Common.mak b/Common.mak
+index eb6cb47..4fc96fe 100644
+--- a/Common.mak
+++ b/Common.mak
+@@ -123,6 +123,8 @@ ifndef HOSTPLATFORM
+             HOSTPLATFORM=DARWIN
+         else ifeq ($(findstring BeOS,$(uname)),BeOS)
+             HOSTPLATFORM=BEOS
+        else ifeq ($(findstring Haiku,$(uname)),Haiku)
+            HOSTPLATFORM=HAIKU
+         else ifeq ($(findstring skyos,$(uname)),skyos)
+             HOSTPLATFORM=SKYOS
+         else ifeq ($(findstring QNX,$(uname)),QNX)
+@@ -948,17 +950,23 @@ ifneq (0,$(POLYMER))
+ endif
+
+
+-ifneq ($(PLATFORM),WINDOWS)
+-    ifneq ($(PLATFORM),WII)
+-        ifneq ($(PLATFORM),BSD)
+-            LIBS+= -ldl
+-        endif
+-        ifneq ($(PLATFORM),DARWIN)
+-            LIBS+= -pthread
+ifneq ($(PLATFORM),HAIKU)
+    ifneq ($(PLATFORM),WINDOWS)
+        ifneq ($(PLATFORM),WII)
+            ifneq ($(PLATFORM),BSD)
+                LIBS+= -ldl
+            endif
+            ifneq ($(PLATFORM),DARWIN)
+                LIBS+= -pthread
+            endif
+         endif
+     endif
+ endif
+
+ifeq ($(PLATFORM),HAIKU)
+    LIBS+= -lpthread -lnetwork
+endif
+
+ ifeq ($(PLATFORM),WINDOWS)
+     ifneq ($(USE_LIBPNG),0)
+         LIBS+= -lpng_mini -lz_mini
+diff --git a/GNUmakefile b/GNUmakefile
+index a966483..7027e1f 100644
+--- a/GNUmakefile
+++ b/GNUmakefile
+@@ -544,6 +544,10 @@ ifeq ($(PLATFORM),BSD)
+     LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo
+ endif
+
+ifeq ($(PLATFORM),HAIKU)
+    LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lexecinfo -lnetwork
+endif
+
+ ifeq ($(PLATFORM),DARWIN)
+     ifneq (0,$(HAVE_XMP))
+         LIBS += -lxmp-lite
+--
+2.12.2
+
+From 1c963d963f506b53b10f431b96caf595037fe091 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sun, 4 Jun 2017 08:30:18 +0200
+Subject: [PATCH] Data file search path fix
+
+---
+ source/duke3d/src/common.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp
+index 0045364..ce62dc6 100644
+--- a/source/duke3d/src/common.cpp
+++ b/source/duke3d/src/common.cpp
+@@ -318,6 +318,8 @@ void G_ExtInit(void)
+                       "EDuke32 Settings"
+ #elif defined(GEKKO)
+                       "apps/eduke32"
+#elif defined(__HAIKU__)
+                      "config/settings/eduke32"
+ #else
+                       ".eduke32"
+ #endif
+--
+2.12.2