Skip to content

Commit

Permalink
Ports/openrct2: Update OpenRCT2 to version 0.4.5
Browse files Browse the repository at this point in the history
This also fixes a small issue where subsequent builds after the initial
one would fail due to the source file missing in the move command.
  • Loading branch information
EWouters authored and gmta committed Oct 12, 2023
1 parent 550f05e commit b780aca
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Ports/AvailablePorts.md
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`ObjFW`](ObjFW/) | ObjFW | 8d19ba9 | https://objfw.nil.im/ |
| [`oksh`](oksh/) | oksh | 7.1 | https://github.com/ibara/oksh |
| [`OpenJDK`](OpenJDK/) | OpenJDK | 17.0.6 | https://openjdk.java.net/ |
| [`openrct2`](openrct2/) | OpenRCT2 | 0.4.4 | https://openrct2.org/ |
| [`openrct2`](openrct2/) | OpenRCT2 | 0.4.5 | https://openrct2.org/ |
| [`openssh`](openssh/) | OpenSSH | 9.0-94eb685 | https://github.com/openssh/openssh-portable |
| [`openssl`](openssl/) | OpenSSL | 3.0.9 | https://www.openssl.org/ |
| [`openttd`](openttd/) | OpenTTD | 13.4 | https://www.openttd.org/ |
Expand Down
8 changes: 4 additions & 4 deletions Ports/openrct2/package.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='openrct2'
version='0.4.4'
version='0.4.5'
depends=(
'curl'
'flac'
Expand All @@ -18,8 +18,8 @@ depends=(
'zlib'
)
files=(
"https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v${version}.tar.gz#18970bfffe49c77fa81ea6c295119b173a613c7310d7762963458e3e77c24913"
"https://github.com/OpenRCT2/OpenRCT2/releases/download/v${version}/OpenRCT2-${version}-linux-jammy-x86_64.tar.gz#e4263121ec51a1340d269e07b366f7ec306013e292babfea9fd768c03e19b5b7"
"https://github.com/OpenRCT2/OpenRCT2/archive/refs/tags/v${version}.tar.gz#eb9e20dc0dcbf10b02b5f334a029983a0a2b43d931f95a2088a64e8b2657bab1"
"https://github.com/OpenRCT2/OpenRCT2/releases/download/v${version}/OpenRCT2-${version}-linux-jammy-x86_64.tar.gz#c0652ace6fd2302e77cd25b85bb973e3c0d2c8be1d20cfdcb7a2a9b15630d112"
)
useconfigure='true'
workdir="OpenRCT2-${version}"
Expand All @@ -45,7 +45,7 @@ configure() {

build() {
cd "${PORT_BUILD_DIR}/OpenRCT2-${version}-build"
mv "${PORT_BUILD_DIR}/OpenRCT2/data/g2.dat" .
[ -f 'g2.dat' ] || mv "${PORT_BUILD_DIR}/OpenRCT2/data/g2.dat" '.'
ninja
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ This irons out some compiler warnings that turned into errors when compiling a r
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76a17f24386dce3e364b292ac23867231123ebe5..687b2361b02ae1c82fc4de8320bdb28487872eec 100644
index 78307ec3de4d769ce750a1da4d6eb5de120babf9..7c0e068143deae77fbaa818169b5cec7585a921e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -298,6 +298,8 @@ else ()
@@ -306,6 +306,8 @@ else ()
# unused-const-variable[=2] would check for unused values from headers as well
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_UNUSED_CONST_VARIABLE -Wunused-const-variable=1)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WNO_CLOBBERED -Wno-clobbered)
Expand All @@ -21,7 +21,7 @@ index 76a17f24386dce3e364b292ac23867231123ebe5..687b2361b02ae1c82fc4de8320bdb284
# Disabled due to problems compiling OpenSSL on macOS.
# ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DOCUMENTATION -Wdocumentation)

@@ -307,7 +309,7 @@ else ()
@@ -315,7 +317,7 @@ else ()
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)

# Currently used MinGW w/GCC 7.2 doesn't provide sane error messages for this
Expand Down
4 changes: 2 additions & 2 deletions Ports/openrct2/patches/0008-Disable-g2.dat-target.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Normally, the build system uses one of the compiled binaries to pack assets into
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 687b2361b02ae1c82fc4de8320bdb28487872eec..bb2cf3395d40c773dbb432ac81473358a3bb71cb 100644
index 7c0e068143deae77fbaa818169b5cec7585a921e..2c781b26bad33730157ecfc3a5775d2ffdc4109f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,7 +386,7 @@ endif ()
@@ -394,7 +394,7 @@ endif ()


# g2
Expand Down

0 comments on commit b780aca

Please sign in to comment.