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

gzdoom, fixes for 32bit (#10848)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-08-17 18:43:24 +02:00
committed by GitHub
parent d99c4d7fc2
commit d61e93ec1f
3 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
games-fps/gzdoom/gzdoom-3.8.2.recipe
View File

@@ -40,7 +40,7 @@ COPYRIGHT="
1997 id Software, Raven Software, and contributors
"
LICENSE="GNU GPL v3"
REVISION="3"
REVISION="4"
SOURCE_URI="https://zdoom.org/files/gzdoom/src/gzdoom-src-g${portVersion}_legacy.zip"
CHECKSUM_SHA256="0c3af7b0af6b59f1ecbcc50e4fc0f70d6b1a33f554f63998a421bbc4da2913e6"
SOURCE_DIR="gzdoom-g${portVersion}_legacy"
@@ -49,6 +49,11 @@ SOURCE_URI_2="https://github.com/EXL/BeGameLauncher/archive/$srcGitRev2.tar.gz"
CHECKSUM_SHA256_2="45b42bb906e7ad1d94819fd18140505ab517ba78b3b593c3315f29bb391cf1ee"
SOURCE_DIR_2="BeGameLauncher-$srcGitRev2"
PATCHES="gzdoom-$portVersion.patchset"
if [ $targetArchitecture = x86_gcc2 ]; then
PATCHES+="
gzdoom-x86-$portVersion.patchset
"
fi
ADDITIONAL_FILES="gzdoom.rdef.in"
ARCHITECTURES="all !x86_gcc2"
@@ -93,7 +98,6 @@ BUILD_PREREQUIRES="
BUILD()
{
export LDFLAGS="-lbsd"
mkdir -p build
cd build
cmake .. \

38
games-fps/gzdoom/patches/gzdoom-3.8.2.patchset
View File

@@ -1,4 +1,4 @@
From 6be179cd9a995f76916f252fd2b98738ed762271 Mon Sep 17 00:00:00 2001
From 8969f5283ccfe1a1e90f99c0d42aa28780ab4f24 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
@@ -87,7 +87,7 @@ index 5718604..e2c76df 100644
2.45.2
From 25b43cfe4e7f690b44e4b2285553b19f79237503 Mon Sep 17 00:00:00 2001
From 5093e7ce8fb3e92db4b7731db066d9a7fb910373 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
@@ -109,37 +109,3 @@ index 63f3500..64339a3 100644
--
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

53
games-fps/gzdoom/patches/gzdoom-x86-3.8.2.patchset Normal file
View File

@@ -0,0 +1,53 @@
From 857f88fdd5acfa62b77ecf0c71fe0e876df8f206 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}")
diff --git a/src/sound/oplsynth/opl.h b/src/sound/oplsynth/opl.h
index d5faa13..6d3817b 100644
--- a/src/sound/oplsynth/opl.h
+++ b/src/sound/oplsynth/opl.h
@@ -1,6 +1,8 @@
#ifndef OPL_H
#define OPL_H
+#include <limits>
+
#include "zstring.h"
// Abstract base class for OPL emulators
@@ -28,4 +30,4 @@ OPLEmul *NukedOPL3Create(bool stereo);
-#endif
\ No newline at end of file
+#endif
--
2.45.2