From 4e5281d62c5af07b631e8162853e5fa6d77e5c65 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 9 Jun 2025 09:03:57 -0400 Subject: [PATCH] OpenRCT2: update to 0.4.23. --- srcpkgs/OpenRCT2/patches/cmake-cross.patch | 13 +++++++++++++ srcpkgs/OpenRCT2/patches/openrct2-cli.patch | 12 ------------ srcpkgs/OpenRCT2/template | 5 ++--- 3 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/OpenRCT2/patches/cmake-cross.patch delete mode 100644 srcpkgs/OpenRCT2/patches/openrct2-cli.patch diff --git a/srcpkgs/OpenRCT2/patches/cmake-cross.patch b/srcpkgs/OpenRCT2/patches/cmake-cross.patch new file mode 100644 index 00000000000..a54a7a46144 --- /dev/null +++ b/srcpkgs/OpenRCT2/patches/cmake-cross.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c011010..4dfd2ef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -392,7 +392,7 @@ if(NOT DISABLE_GUI) + endif() + + # graphics files (g2.dat and font.dat) +-if (NOT CMAKE_CROSSCOMPILING) ++if (TRUE) + set(graphics_files "g2" "fonts" "tracks") + + foreach(graphics_file ${graphics_files}) diff --git a/srcpkgs/OpenRCT2/patches/openrct2-cli.patch b/srcpkgs/OpenRCT2/patches/openrct2-cli.patch deleted file mode 100644 index 8e5c30cd19e..00000000000 --- a/srcpkgs/OpenRCT2/patches/openrct2-cli.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c9c405..42e05e3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -403,6 +403,7 @@ if (NOT (MACOS_BUNDLE AND (NOT CMAKE_OSX_ARCHITECTURES MATCHES "${SYSTEM_MACOS_A - add_custom_command( - OUTPUT g2.dat - COMMAND ./openrct2-cli sprite build ${CMAKE_BINARY_DIR}/g2.dat ${ROOT_DIR}/resources/g2/sprites.json -+ DEPENDS openrct2-cli - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - add_custom_target(g2 DEPENDS ${PROJECT_NAME} g2.dat) diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index e1e6a5f8088..c3c813f0f63 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -2,7 +2,7 @@ # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421 pkgname=OpenRCT2 -version=0.4.22 +version=0.4.23 revision=1 # versions pulled from https://raw.githubusercontent.com/OpenRCT2/OpenRCT2/v${version}/CMakeLists.txt _objects_version=1.6.1 @@ -20,7 +20,6 @@ configure_args=" -DDISABLE_GOOGLE_BENCHMARK=1 $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1') $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')" -make_build_target="all g2" hostmakedepends="pkg-config unzip" makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel libpng-devel speexdsp-devel icu-devel zlib-devel json-c++ libxml2-devel @@ -40,7 +39,7 @@ distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz https://github.com/OpenRCT2/OpenMusic/releases/download/v${_openmsx_version}/openmusic.zip>openmusic-${_openmsx_version}.zip https://github.com/OpenRCT2/replays/releases/download/v${_replays_version}/replays.zip>replays-${_replays_version}.zip https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip>title-sequences-${_titles_version}.zip" -checksum="a626c2ceea6a20a5edb7908c045de52629f5b48be40c05c29fbf42796df94344 +checksum="1eac23e999aab1280da88a052d66f928c9d66ec4e7e6c844d628b1b3744f9d18 6829186630e52c332b6a4847ebb936c549a522fcadaf8f5e5e4579c4c91a4450 a952148be164c128e4fd3aea96822e5f051edd9a0b1f2c84de7f7628ce3b2e18 f097d3a4ccd39f7546f97db3ecb1b8be73648f53b7a7595b86cccbdc1a7557e4