mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
scummvm, bump to version 2026.1.0 (#13641)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 8e3c9607a983f6c07577f88e8e87dd7956e1307b Mon Sep 17 00:00:00 2001
|
||||
From 3312a01e33ad58a0bc14edd845828255e74f961d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 25 Jan 2025 10:12:50 +0100
|
||||
Subject: Haiku patch
|
||||
@@ -44,21 +44,22 @@ index f2330f7..979dca9 100644
|
||||
if (launchBrowser(getenv("DEFAULT_BROWSER"), url))
|
||||
return true;
|
||||
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
|
||||
index b8b3932..a5f329c 100644
|
||||
index 2469849..dca06ce 100644
|
||||
--- a/backends/saves/posix/posix-saves.cpp
|
||||
+++ b/backends/saves/posix/posix-saves.cpp
|
||||
@@ -25,6 +25,10 @@
|
||||
@@ -25,6 +25,11 @@
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_time_h //On IRIX, sys/stat.h includes sys/time.h
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
|
||||
#define FORBIDDEN_SYMBOL_EXCEPTION_getenv
|
||||
+#if defined(HAIKU)
|
||||
+#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
|
||||
+#define FORBIDDEN_SYMBOL_EXCEPTION_getcwd
|
||||
+#define FORBIDDEN_SYMBOL_EXCEPTION_unlink
|
||||
+
|
||||
+#endif
|
||||
|
||||
#include "common/scummsys.h"
|
||||
|
||||
@@ -41,6 +45,9 @@
|
||||
@@ -41,6 +46,9 @@
|
||||
#include "common/textconsole.h"
|
||||
|
||||
#include <sys/stat.h>
|
||||
@@ -68,25 +69,26 @@ index b8b3932..a5f329c 100644
|
||||
|
||||
POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
// Register default savepath.
|
||||
@@ -52,6 +59,13 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
savePath.joinInPlace("Savegames");
|
||||
@@ -53,6 +61,14 @@ POSIXSaveFileManager::POSIXSaveFileManager() {
|
||||
ConfMan.registerDefault("savepath", savePath);
|
||||
}
|
||||
+#elif defined(HAIKU)
|
||||
+ char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, buffer, sizeof(buffer)) != B_OK)
|
||||
+ strlcpy(buffer, "/boot/home/config/settings", sizeof(buffer));
|
||||
+ savePath = buffer;
|
||||
+ savePath.joinInPlace("scummvm/saves");
|
||||
+ ConfMan.registerDefault("savepath", savePath);
|
||||
#else
|
||||
const char *envVar;
|
||||
|
||||
+#elif defined(HAIKU)
|
||||
+ char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, buffer, sizeof(buffer)) != B_OK)
|
||||
+ strlcpy(buffer, "/boot/home/config/settings", sizeof(buffer));
|
||||
+ savePath = buffer;
|
||||
+ savePath.joinInPlace("scummvm/saves");
|
||||
+ ConfMan.registerDefault("savepath", savePath);
|
||||
+
|
||||
#elif defined(EMSCRIPTEN)
|
||||
savePath = getenv("HOME");
|
||||
savePath.joinInPlace("saves");
|
||||
diff --git a/configure b/configure
|
||||
index a9b2525..8abda06 100755
|
||||
index 41342e0..19e48d2 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3284,6 +3284,7 @@ EOF
|
||||
@@ -3419,6 +3419,7 @@ EOF
|
||||
fi
|
||||
;;
|
||||
haiku*)
|
||||
@@ -95,20 +97,20 @@ index a9b2525..8abda06 100755
|
||||
append_var DEFINES "-D_GNU_SOURCE"
|
||||
# Needs -lnetwork for the timidity MIDI driver
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
|
||||
From 5dee27721596cd087c42db55099ed7812a334ce9 Mon Sep 17 00:00:00 2001
|
||||
From 1c78a5d2fdc3ae1ed5ae5867192c48237611270a Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Tue, 13 May 2025 10:40:18 +0200
|
||||
Subject: Fix conflicting int types
|
||||
|
||||
|
||||
diff --git a/common/scummsys.h b/common/scummsys.h
|
||||
index 397e46d..ce3a169 100644
|
||||
index c658de0..94364df 100644
|
||||
--- a/common/scummsys.h
|
||||
+++ b/common/scummsys.h
|
||||
@@ -505,6 +505,12 @@
|
||||
@@ -444,6 +444,12 @@
|
||||
*/
|
||||
typedef unsigned long uint32;
|
||||
typedef signed long int32;
|
||||
@@ -122,5 +124,5 @@ index 397e46d..ce3a169 100644
|
||||
typedef uint32_t uint32;
|
||||
typedef int32_t int32;
|
||||
--
|
||||
2.48.1
|
||||
2.52.0
|
||||
|
||||
@@ -8,8 +8,8 @@ HOMEPAGE="https://www.scummvm.org/"
|
||||
COPYRIGHT="2001-2024 ScummVM Team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://www.scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="9c89a273fb0c602414888bec6d99d507fff99336b22474f857057ea7ffac3f8e"
|
||||
SOURCE_URI="http://www.scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="1ce520faa16bc19d173d5296b4561979535b43ded0948e0249e2e8cb3d1d9bea"
|
||||
ADDITIONAL_FILES="scummvm.rdef.in"
|
||||
PATCHES="scummvm-$portVersion.patchset"
|
||||
|
||||
@@ -27,12 +27,12 @@ REQUIRES="
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libfaad$secondaryArchSuffix
|
||||
lib:libflac$secondaryArchSuffix
|
||||
lib:libFLAC$secondaryArchSuffix
|
||||
lib:libfluidsynth$secondaryArchSuffix >= 2
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libgl$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libglew$secondaryArchSuffix
|
||||
lib:libglu$secondaryArchSuffix
|
||||
lib:libGLU$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libmad$secondaryArchSuffix
|
||||
lib:libmpeg2$secondaryArchSuffix
|
||||
@@ -54,12 +54,12 @@ BUILD_REQUIRES="
|
||||
devel:libcrypto$secondaryArchSuffix >= 3
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libfaad$secondaryArchSuffix
|
||||
devel:libflac$secondaryArchSuffix
|
||||
devel:libFLAC$secondaryArchSuffix
|
||||
devel:libfluidsynth$secondaryArchSuffix >= 2
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libgl$secondaryArchSuffix
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libglew$secondaryArchSuffix >= 2.2
|
||||
devel:libglu$secondaryArchSuffix
|
||||
devel:libGLU$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libmad$secondaryArchSuffix
|
||||
devel:libmpeg2$secondaryArchSuffix
|
||||
@@ -87,7 +87,7 @@ BUILD()
|
||||
libtoolize --force --copy --install
|
||||
./configure --prefix=$prefix \
|
||||
--bindir=$appsDir --libdir=$libDir --datarootdir=$dataDir \
|
||||
--mandir=$manDir --docdir=$docDir \
|
||||
--mandir=$manDir --docdir=$documentationDir/packages/scummvm \
|
||||
--disable-debug --enable-release --disable-eventrecorder # \
|
||||
# --disable-all-engines
|
||||
# can be used to compile scummvm without
|
||||
@@ -103,7 +103,7 @@ INSTALL()
|
||||
mv $appsDir/scummvm $appsDir/ScummVM
|
||||
|
||||
# cleanup
|
||||
rm -r $dataDir/{applications,icons,pixmaps}
|
||||
rm -r $dataDir/{applications,metainfo,pixmaps}
|
||||
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
Reference in New Issue
Block a user