Update OpenRCT2 to 0.4.32 (#13867)

This commit is contained in:
Peppersawce
2026-04-01 12:47:51 +02:00
committed by GitHub
parent e278fe6632
commit 62d0534235
3 changed files with 38 additions and 98 deletions

View File

@@ -4,19 +4,18 @@ The gameplay revolves around building and maintaining an amusement park containi
OpenRCT2 requires the original files from RollerCoaster Tycoon 2 in order to play. OpenRCT2 requires the original files from RollerCoaster Tycoon 2 in order to play.
If you have the original RollerCoaster Tycoon and its expansion packs, you can point \ If you have the original RollerCoaster Tycoon and its expansion packs, you can point \
OpenRCT2 to these in order to play the original scenarios. OpenRCT2 to these in order to play the original scenarios."
Multithreaded rendering is disabled by default as it crashes on Haiku in certain maps and title sequences."
HOMEPAGE="https://openrct2.io/" HOMEPAGE="https://openrct2.io/"
COPYRIGHT="2015-2025 OpenRCT2 team" COPYRIGHT="2015-2026 OpenRCT2 team"
LICENSE="GNU GPL v3" LICENSE="GNU GPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v$portVersion.tar.gz" SOURCE_URI="https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="89f35c764b8dcdb9519b17c24bb5aff8f8106c8cc1158c6a3604448168f4fa60" CHECKSUM_SHA256="0286785d0b4f984a6e3126e4215dd5ecc31db9d36df58526966b96412374e80c"
SOURCE_DIR="OpenRCT2-$portVersion" SOURCE_DIR="OpenRCT2-$portVersion"
SOURCE_URI_2="https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.26/title-sequences.zip" SOURCE_URI_2="https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.26/title-sequences.zip"
CHECKSUM_SHA256_2="dabb9787b1576342fca4dd9f64b3f8cfa04a7e6ce9c2bb9610f47b762905c858" CHECKSUM_SHA256_2="dabb9787b1576342fca4dd9f64b3f8cfa04a7e6ce9c2bb9610f47b762905c858"
SOURCE_URI_3="https://github.com/OpenRCT2/objects/releases/download/v1.7.5/objects.zip" SOURCE_URI_3="https://github.com/OpenRCT2/objects/releases/download/v1.7.6/objects.zip"
CHECKSUM_SHA256_3="c8b9d3039a920f67caf15b09e8312cc4f80d59ed7fe0288625b9ccedef606797" CHECKSUM_SHA256_3="6aca2eb441fbe8c022ff84d59fb51ed7ea577756640970dc989eab685ff45696"
SOURCE_URI_4="https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.6/opensound.zip" SOURCE_URI_4="https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.6/opensound.zip"
CHECKSUM_SHA256_4="06b90f3e19c216752df441d551b26a9e3e1ba7755bdd2102504b73bf993608be" CHECKSUM_SHA256_4="06b90f3e19c216752df441d551b26a9e3e1ba7755bdd2102504b73bf993608be"
SOURCE_URI_5="https://github.com/OpenRCT2/OpenMusic/releases/download/v1.6.1/openmusic.zip" SOURCE_URI_5="https://github.com/OpenRCT2/OpenMusic/releases/download/v1.6.1/openmusic.zip"

View File

@@ -1,92 +0,0 @@
From e3f44d1b10bb9099b1df2a47efd53c72e9ffe463 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 23 Dec 2025 11:58:37 +0100
Subject: Haiku patch for gcc
diff --git a/src/openrct2/core/Range.hpp b/src/openrct2/core/Range.hpp
index 6e15dd6..7a1ac3d 100644
--- a/src/openrct2/core/Range.hpp
+++ b/src/openrct2/core/Range.hpp
@@ -29,6 +29,10 @@ struct Range
T Change{};
private:
+ #if defined(__GNUC__) && !defined(__clang__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
Iterator(const Range& range, T initialValue)
: Lower(range.Lower)
, Upper(range.Upper)
@@ -36,6 +40,9 @@ struct Range
, Change(range.Upper >= range.Lower ? 1 : -1)
{
}
+ #if defined(__GNUC__) && !defined(__clang__)
+ #pragma GCC diagnostic pop
+ #endif
public:
Iterator& operator++()
--
2.52.0
From e24b67062f3938df68128668b5d68c0ca52baaad Mon Sep 17 00:00:00 2001
From: Peppersawce <michaelpeppers89@yahoo.it>
Date: Sun, 1 Feb 2026 20:58:59 +0100
Subject: Fix Haiku build
diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp
index d68e1e7..a7983d8 100644
--- a/src/openrct2/core/String.cpp
+++ b/src/openrct2/core/String.cpp
@@ -38,7 +38,7 @@
#include "StringBuilder.h"
#include "UTF8.h"
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__unix__) || defined(__HAIKU__) || (defined(__APPLE__) && defined(__MACH__))
#include <strings.h>
#define _stricmp(x, y) strcasecmp((x), (y))
#endif
--
2.52.0
From 75d1e70caf67db4fec9447940a5e2a8a36594042 Mon Sep 17 00:00:00 2001
From: Peppersawce <michaelpeppers89@yahoo.it>
Date: Sun, 1 Feb 2026 21:22:08 +0100
Subject: Re-enable multithreading
diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
index e06df18..bc9345c 100644
--- a/src/openrct2/config/Config.cpp
+++ b/src/openrct2/config/Config.cpp
@@ -50,11 +50,6 @@ static constexpr bool kEnlargedUiDefault = true;
#else
static constexpr bool kEnlargedUiDefault = false;
#endif
-#ifdef __HAIKU__ // Multi-threading is unstable here
-static constexpr bool kMultiThreadingDefault = false;
-#else
-static constexpr bool kMultiThreadingDefault = true;
-#endif
namespace OpenRCT2::Config
{
@@ -243,7 +238,7 @@ namespace OpenRCT2::Config
// Always have multi-threading disabled in debug builds, this makes things slower.
model->multiThreading = false;
#else
- model->multiThreading = reader->GetBoolean("multithreading", kMultiThreadingDefault);
+ model->multiThreading = reader->GetBoolean("multithreading", true);
#endif // _DEBUG
model->trapCursor = reader->GetBoolean("trap_cursor", false);
model->autoOpenShops = reader->GetBoolean("auto_open_shops", false);
--
2.52.0

View File

@@ -0,0 +1,33 @@
From e3f44d1b10bb9099b1df2a47efd53c72e9ffe463 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 23 Dec 2025 11:58:37 +0100
Subject: Haiku patch for gcc
diff --git a/src/openrct2/core/Range.hpp b/src/openrct2/core/Range.hpp
index 6e15dd6..7a1ac3d 100644
--- a/src/openrct2/core/Range.hpp
+++ b/src/openrct2/core/Range.hpp
@@ -29,6 +29,10 @@ struct Range
T Change{};
private:
+ #if defined(__GNUC__) && !defined(__clang__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+ #endif
Iterator(const Range& range, T initialValue)
: Lower(range.Lower)
, Upper(range.Upper)
@@ -36,6 +40,9 @@ struct Range
, Change(range.Upper >= range.Lower ? 1 : -1)
{
}
+ #if defined(__GNUC__) && !defined(__clang__)
+ #pragma GCC diagnostic pop
+ #endif
public:
Iterator& operator++()
--
2.52.0