From 078c3d5c69e58d5b2f58c8b6593ddf4d0c2201cb Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 17 Aug 2024 12:35:14 +0200
Subject: [PATCH] gzdoom, fixes for 32bit (#10845)

---
 games-fps/gzdoom/gzdoom-3.8.2.recipe          |  6 ++-
 .../gzdoom/patches/gzdoom-3.8.2.patchset      | 42 +++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-3.8.2.recipe b/games-fps/gzdoom/gzdoom-3.8.2.recipe
index 63de37fec..62c502635 100644
--- a/games-fps/gzdoom/gzdoom-3.8.2.recipe
+++ b/games-fps/gzdoom/gzdoom-3.8.2.recipe
@@ -60,6 +60,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
 	lib:libfluidsynth$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libgme$secondaryArchSuffix
@@ -71,10 +72,13 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libdumb$secondaryArchSuffix
 	devel:libfluidsynth$secondaryArchSuffix
 	devel:libGL$secondaryArchSuffix
 	devel:libgme$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -96,7 +100,7 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS="-D_GNU_SOURCE -D_BSD_SOURCE" \
 		-DCMAKE_EXE_LINKER_FLAGS="-lbsd"
-	make $jobArgs
+	make
 
 	cd $sourceDir2
 	mkdir -p build
diff --git a/games-fps/gzdoom/patches/gzdoom-3.8.2.patchset b/games-fps/gzdoom/patches/gzdoom-3.8.2.patchset
index 116b85416..a2850f53a 100644
--- a/games-fps/gzdoom/patches/gzdoom-3.8.2.patchset
+++ b/games-fps/gzdoom/patches/gzdoom-3.8.2.patchset
@@ -1,4 +1,4 @@
-From c66d4ac662840af459b64a77aaa998867d1cf5c7 Mon Sep 17 00:00:00 2001
+From 6be179cd9a995f76916f252fd2b98738ed762271 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 30 Oct 2019 21:24:04 +1000
 Subject: Haiku fixes
@@ -84,10 +84,10 @@ index 5718604..e2c76df 100644
  #    include <stdint.h>
  #else // HAVE_STDINT_H
 -- 
-2.23.0
+2.45.2
 
 
-From 962e2c5f581da68cacd0d588ae7bcd2c7f17d12c Mon Sep 17 00:00:00 2001
+From 25b43cfe4e7f690b44e4b2285553b19f79237503 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Thu, 31 Oct 2019 21:22:03 +1000
 Subject: Fix GAME_DIR for Haiku
@@ -107,5 +107,39 @@ index 63f3500..64339a3 100644
  #define GAME_DIR ".config/" GAMENAMELOWERCASE
  #endif
 -- 
-2.23.0
+2.45.2
+
+
+From 0b6ab8eefb391c296a2a68a1cdc9681465b8e592 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <begasus@gmail.com>
+Date: Sat, 17 Aug 2024 10:48:29 +0200
+Subject: Fix 32bit build
+
+
+diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
+index f759f99..bccd879 100644
+--- a/cmake/FindSDL2.cmake
++++ b/cmake/FindSDL2.cmake
+@@ -83,7 +83,8 @@ FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+   /opt/local # DarwinPorts
+   /opt/csw # Blastwave
+   /opt
+-  /boot/system/develop/headers/SDL2 #Hiaku OS
++  /boot/system/develop/headers/SDL2 #Haiku
++  /boot/system/develop/headers/x86/SDL2 #Haiku
+ )
+ #MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
+ 
+@@ -97,7 +98,8 @@ FIND_LIBRARY(SDL2_LIBRARY_TEMP
+   /opt/local
+   /opt/csw
+   /opt
+-  /system/lib #Hiaku OS
++  /system/lib #Haiku
++  /system/lib/x86 #Haiku
+ )
+ 
+ #MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
+-- 
+2.45.2