diff options
Diffstat (limited to 'games-simulation')
17 files changed, 399 insertions, 229 deletions
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index b72ec10d4815..02057dfe994a 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -1,10 +1,6 @@ -DIST openrct2-0.4.12.tar.gz 21881586 BLAKE2B 4832f55883fa30e16c4d06231516329143e02e440dfc0d48c66eec162016c619cdaf8b421a891506276a3dd53def76b9c1fa97b97252b3683c5ceb30f4fd3c64 SHA512 dae0e4e42306853883c17523b3c814775ff782b1e50683aa72a278d121132610336f9307299f86dfdc27310b2f8403fff4d34a68a8814f6a7bba88646d587922 -DIST openrct2-0.4.14.tar.gz 21917635 BLAKE2B 0fc5a105a416a1a9634ca90542c5234e19da534f07554c1f278b75a1209158d3783cfd69fad1e492140788f9cf3716f5e943391c7787015ae038ccaf7da8765d SHA512 11eaec800aee9667d1a9d5f255f556572221b5f2190740d16c847e23bb1feb75fcb3876c4078ca069517eda72a27fb22f5c6fb91458bdf66dfe1f8ab51bd4e07 -DIST openrct2-objects-1.4.6.zip 5411575 BLAKE2B cb570d88815f82231340aa012e632fd669ac336f6d79227f602d9e702c78944dbeb805a8fb468874c7e67b0b4d6ed0a21559ed81a5e065d08ae35d1133d67f90 SHA512 d739ab2416b45b95dbf13a148bb4e8687bbf4c228429c455a35ff55235eb21da743ed31dbb133e2dde07fc4c4fe250ecee7a15ec7fbb6708fb6f222f9f69ae42 -DIST openrct2-objects-1.4.7.zip 5411765 BLAKE2B 0ac59fbee6d22f832f52f03ad6e4e15bd60ba1955fc7a8f9deaf8fd114483cfdf20cd8ced42494716bf7a1d8dbeb7969cb1fa3852ae11e9afb0819c90ae6d389 SHA512 54f6872502333dc4063d0eca6d9e2cb6f7e6c7593be014a3c17df3b9a6dfa354b50c995953fb56973db8cef3733eedb3b64e680fe136724328156c1c590d9ae7 -DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23823097ca96189dabeb0e43d7050d5e776aa309c38de247da15b1eec7ed6be6299d5673a92df1323cc3a4a5bbc4f48d567 SHA512 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3 +DIST openrct2-0.4.16.tar.gz 22266650 BLAKE2B 19efa7f08d2f1b82dc3643d6627a1e4758dd679c44d6f49992969b1e75dd5edfe2ab4fce7652dfebcc2e1574a6a404fa2abbf4dc281fb36a26c25ec40024ccc5 SHA512 523ecb6c1358b7d2ee51e862b96fd72215ba5151b888af2878baec099492e097c3d7a99525041e803c5f647eb97c9082751ccf97a468fb7e071d050a9c5fa4c7 +DIST openrct2-objects-1.4.10.zip 7495378 BLAKE2B d59f17a419abc935c781075d526ba5e8d6c90d5a524fd314a8c9da3cbd211f87340d615f3a9fe292e2b28cc260734ed344cf2da1e8c76e7310076c2ad163adb0 SHA512 a137a81f6c627ac5d7222c34009d92a24e65bea9b8e0108e59fdf393f1000caee99b9dc9947f824241c055796112d11609b1bcae50ddc33f419723a06b708f64 DIST openrct2-openmusic-1.6.zip 42921141 BLAKE2B fff3ac6d944ed2021645c064de3daf88c11930bf8817e9c8620cfa73f2da076745dd5b5da36b616c8ee7b2ee0272228a88e264bf1ce948509dc90d77a7a87d5d SHA512 88e3242da45f372e06de04e58d03fc3d256b1485467a25a3f8878c03eb2570eea2c787a9e0416c1b040c15886723ced1379d762f941a23e4bd2fce81416123b0 DIST openrct2-opensound-1.0.5.zip 4012384 BLAKE2B 7ddb1437d7e68373f05bd60d77f03971b8a1d6f4280d008d5bf3e86b5d2cb46001a04edddeeb04a06a37801c3afbd35926beb54fe5a72c7fa88b50d0a0b18535 SHA512 fc46ffb3f6243b3d783a280481ce373a8ddc8cf1fd28bfeceecf6223b72b38f1d49d0c95eea3376308a61a77c50c7a06252b6d72248cfecc493b63b65bd6512a -DIST openrct2-replays-0.0.79.zip 1934633 BLAKE2B 4b5c4d96be91055ceff8f5f5f1a894cc2544659983e61ac2f42d655229357b6a368553c1ee45d147cb360c8d54bb0ca78b61a9716efa8d1d7f37cd7c5ba50fa7 SHA512 04acde4d60c8fa949b298dd15e38fe0421659357fa214dffb0577574e0b0ac218a01ce998f4e12e3ab13a88fbbba8096392462fda29c68a6215bc0875aaae9b2 +DIST openrct2-replays-0.0.83.zip 1829681 BLAKE2B fd3a6ff457d45b0b429b667173c95753bdbf9ecd136a7ce16b516c701d88e436e1796c32d1aa5dc7837dd35ea8db5a89a2c42a99dcd5744b826ab32f98030f98 SHA512 43877cd8452049d4519f0d3fd49d9234195a3d3e38af9a880d43509f0a578e1fef0d428673fea1a9a8307d9917be3e3c4ca9d9e466584b6abd5193a366d5f569 DIST openrct2-title-sequences-0.4.14.zip 7791573 BLAKE2B e0bc547b26ba0032c54be0661a1e26bf63a73e3bf0183e3e3d972cbff80e95dd4fa2584852f0da6a597849d822b6d89c3154cbe5ecc99b7eb456560810ed8d17 SHA512 27a1f5e87063ed9baf5faeca15a914e1a57584da6ab0d06d2b9e1f08e801c53f2ea9826381bf5e3dd8e220ff2da601a98841a08f9bcad1e0280b04746512bfb1 -DIST openrct2-title-sequences-0.4.6.zip 2547725 BLAKE2B 5f7b36cd1372106923000775307ea7ff8c142c3b1d026d84b86f255a629b0a2ac16a682300999789229a8833d4c7327c858c04710ecddfb97af1858ff121a5c4 SHA512 bd7d0f25047540572be75a4a8886e8dabdceb7a3e11fdeb5473b66fe804d829acdb763d34ec7cfa656df9bc527268a3e0e7ca09c699995804b22ff2a529ad5da diff --git a/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch deleted file mode 100644 index b90d48c63c33..000000000000 --- a/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/openrct2/config/Config.cpp -+++ b/src/openrct2/config/Config.cpp -@@ -638,6 +638,7 @@ - log_verbose("config_find_rct1_path(...)"); - - static constexpr u8string_view searchLocations[] = { -+ R"(/usr/share/openrct2/rct1_data)", - R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", - R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)", - R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)", -@@ -683,6 +684,7 @@ - log_verbose("config_find_rct2_path(...)"); - - static constexpr u8string_view searchLocations[] = { -+ R"(/usr/share/openrct2/rct2_data)", - R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)", - R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)", - R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", diff --git a/games-simulation/openrct2/files/openrct2-0.4.16-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.16-include-additional-paths.patch new file mode 100644 index 000000000000..4391ea90e00b --- /dev/null +++ b/games-simulation/openrct2/files/openrct2-0.4.16-include-additional-paths.patch @@ -0,0 +1,18 @@ +--- a/src/openrct2/platform/Platform.Linux.cpp ++++ b/src/openrct2/platform/Platform.Linux.cpp +@@ -336,6 +336,7 @@ + std::vector<std::string_view> GetSearchablePathsRCT1() + { + return { ++ "/usr/share/openrct2/rct1_data", + // game-data-packager uses this path when installing game files + "/usr/share/games/roller-coaster-tycoon", + }; +@@ -344,6 +345,7 @@ + std::vector<std::string_view> GetSearchablePathsRCT2() + { + return { ++ "/usr/share/openrct2/rct2_data", + // game-data-packager uses this path when installing game files + "/usr/share/games/roller-coaster-tycoon2", + }; diff --git a/games-simulation/openrct2/files/openrct2-0.4.16-tileelement.patch b/games-simulation/openrct2/files/openrct2-0.4.16-tileelement.patch new file mode 100644 index 000000000000..431a0660524d --- /dev/null +++ b/games-simulation/openrct2/files/openrct2-0.4.16-tileelement.patch @@ -0,0 +1,10 @@ +--- OpenRCT2-0.4.16/src/openrct2/ride/RideRatings.cpp.orig 2024-11-10 09:48:55.356964603 +0100 ++++ OpenRCT2-0.4.16/src/openrct2/ride/RideRatings.cpp 2024-11-10 09:50:34.049333283 +0100 +@@ -23,6 +23,7 @@ + #include "../world/tile_element/PathElement.h" + #include "../world/tile_element/SurfaceElement.h" ++#include "../world/tile_element/TileElement.h" + #include "../world/tile_element/TrackElement.h" + #include "Ride.h" + #include "RideData.h" + #include "Station.h" diff --git a/games-simulation/openrct2/openrct2-0.4.14.ebuild b/games-simulation/openrct2/openrct2-0.4.14.ebuild deleted file mode 100644 index 259d2e1f7bfa..000000000000 --- a/games-simulation/openrct2/openrct2-0.4.14.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake readme.gentoo-r1 xdg-utils - -MY_PN="OpenRCT2" -MY_PN_MSX="openmusic" -MY_PN_OBJ="objects" -MY_PN_RPL="replays" -MY_PN_SFX="opensound" -MY_PN_TS="title-sequences" -MY_PV_MSX="1.5" -MY_PV_OBJ="1.4.7" -MY_PV_RPL="0.0.79" -MY_PV_SFX="1.0.5" -MY_PV_TS="0.4.14" - -DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" -HOMEPAGE="https://openrct2.org/" -SRC_URI=" - https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/${MY_PN}/${MY_PN_MSX}/releases/download/v${MY_PV_MSX}/${MY_PN_MSX}.zip -> ${PN}-${MY_PN_MSX}-${MY_PV_MSX}.zip - https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip - https://github.com/${MY_PN}/OpenSoundEffects/releases/download/v${MY_PV_SFX}/${MY_PN_SFX}.zip -> ${PN}-${MY_PN_SFX}-${MY_PV_SFX}.zip - https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip - test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip ) -" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="dedicated +flac +opengl scripting test +truetype +vorbis" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/icu:= - dev-libs/jansson:= - dev-libs/libzip:= - media-libs/libpng:= - net-misc/curl[ssl] - sys-libs/zlib - !dedicated? ( - media-libs/libsdl2 - media-libs/speexdsp - flac? ( media-libs/flac:= ) - opengl? ( virtual/opengl ) - vorbis? ( media-libs/libvorbis ) - ) - dev-libs/openssl:0= - scripting? ( dev-lang/duktape:= ) - truetype? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - ) -" - -RDEPEND=" - ${COMMON_DEPEND} - dedicated? ( - acct-group/openrct2 - acct-user/openrct2 - ) -" - -DEPEND=" - ${COMMON_DEPEND} - dev-cpp/nlohmann_json - test? ( dev-cpp/gtest ) -" - -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch" - "${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch" -) - -src_unpack() { - unpack "${P}".tar.gz - - mkdir -p "${S}"/data || die - cd "${S}"/data - unpack "${PN}-${MY_PN_MSX}-${MY_PV_MSX}".zip - unpack "${PN}-${MY_PN_SFX}-${MY_PV_SFX}".zip - - mkdir -p "${S}"/data/object || die - cd "${S}"/data/object || die - unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip - - mkdir -p "${S}"/data/sequence || die - cd "${S}"/data/sequence || die - unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip - - if use test; then - mkdir -p "${S}"/testdata/replays || die - cd "${S}"/testdata/replays || die - unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip - fi -} - -src_prepare() { - cmake_src_prepare - - # Don't treat warnings as errors. - sed -e 's/-Werror//' -i CMakeLists.txt || die -} - -src_configure() { - # Note: There is currently no support for Disord-RPC and Google Benchmark, - # as both packages do not exist in Gentoo, so support for them has been disabled. - local mycmakeargs=( - -DDISABLE_DISCORD_RPC=ON - $(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "") - -DDISABLE_GOOGLE_BENCHMARK=ON - -DDISABLE_GUI=$(usex dedicated) - -DDISABLE_HTTP=OFF - -DDISABLE_IPO=ON - -DDISABLE_NETWORK=OFF - $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "") - -DDISABLE_TTF=$(usex !truetype) - $(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "") - -DDOWNLOAD_OBJECTS=OFF - -DDOWNLOAD_OPENMSX=OFF - -DDOWNLOAD_OPENSFX=OFF - -DDOWNLOAD_REPLAYS=OFF - -DDOWNLOAD_TITLE_SEQUENCES=OFF - -DENABLE_SCRIPTING=$(usex scripting) - -DOPENRCT2_USE_CCACHE=OFF - -DPORTABLE=OFF - -DSTATIC=OFF - -DWITH_TESTS=$(usex test) - -DUSE_MMAP=ON - ) - - cmake_src_configure -} - -src_test() { - # Since the tests need the OpenRCT2 data, - # we need to symlink them into the build directory, - # otherwise some tests will fail, as they don't find the OpenRCT2 data. - # It is currently not possible to override that path. - # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473 - ln -s "${S}"/data "${BUILD_DIR}" || die - - cmake_src_test -} - -src_install() { - use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" ) - - cmake_src_install - - if use dedicated; then - newinitd "${FILESDIR}"/openrct2.initd openrct2 - newconfd "${FILESDIR}"/openrct2.confd openrct2 - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/games-simulation/openrct2/openrct2-0.4.12.ebuild b/games-simulation/openrct2/openrct2-0.4.16.ebuild index 9a13bc09d499..ddfec5874f74 100644 --- a/games-simulation/openrct2/openrct2-0.4.12.ebuild +++ b/games-simulation/openrct2/openrct2-0.4.16.ebuild @@ -11,11 +11,11 @@ MY_PN_OBJ="objects" MY_PN_RPL="replays" MY_PN_SFX="opensound" MY_PN_TS="title-sequences" -MY_PV_MSX="1.5" -MY_PV_OBJ="1.4.6" -MY_PV_RPL="0.0.79" +MY_PV_MSX="1.6" +MY_PV_OBJ="1.4.10" +MY_PV_RPL="0.0.83" MY_PV_SFX="1.0.5" -MY_PV_TS="0.4.6" +MY_PV_TS="0.4.14" DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" HOMEPAGE="https://openrct2.org/" @@ -77,8 +77,9 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch" "${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch" + "${FILESDIR}/${PN}-0.4.16-include-additional-paths.patch" + "${FILESDIR}/${PN}-0.4.16-tileelement.patch" ) src_unpack() { diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild index f1b852b0fabd..17e2738c612e 100644 --- a/games-simulation/openrct2/openrct2-9999.ebuild +++ b/games-simulation/openrct2/openrct2-9999.ebuild @@ -15,8 +15,8 @@ MY_PN_RPL="replays" MY_PN_SFX="opensound" MY_PN_TS="title-sequences" MY_PV_MSX="1.6" -MY_PV_OBJ="1.4.7" -MY_PV_RPL="0.0.79" +MY_PV_OBJ="1.4.10" +MY_PV_RPL="0.0.83" MY_PV_SFX="1.0.5" MY_PV_TS="0.4.14" @@ -78,8 +78,8 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch" "${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch" + "${FILESDIR}/${PN}-0.4.6-include-additional-paths.patch" ) src_unpack() { diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index f79a14b6fda2..b9563af6363a 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1 +1,2 @@ DIST openttd-13.4-source.tar.xz 7428012 BLAKE2B 0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550 SHA512 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001 +DIST openttd-14.1-source.tar.xz 8015032 BLAKE2B d107cd41a04f1a0bcfd41730e57628787443e8fe6d90dd59b0211b115b462a8e57e68a30e4b1c72d5f9db2121650f1c4035303e64f7e2e71fdedb23665f445da SHA512 194135cc01457d9ed069c09d8961ad3de681bc9936533ca81ff23099f394bb9a83ef84a0852e85525e258f6149e14fd41cfc5f8e683c0643515005c42fb77e3b diff --git a/games-simulation/openttd/files/openttd-13.4-icu-76.1.patch b/games-simulation/openttd/files/openttd-13.4-icu-76.1.patch new file mode 100644 index 000000000000..840942c01a67 --- /dev/null +++ b/games-simulation/openttd/files/openttd-13.4-icu-76.1.patch @@ -0,0 +1,27 @@ +https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e (rebased) + +From 14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e Mon Sep 17 00:00:00 2001 +From: fundawang <fundawang@yeah.net> +Date: Tue, 5 Nov 2024 19:12:34 +0800 +Subject: [PATCH] Fix: build with icu >= 76 where icu-i18n and icu-uc become + separated (#13048) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,7 +135,7 @@ if(NOT OPTION_DEDICATED) + endif() + find_package(Fluidsynth) + find_package(Fontconfig) +- find_package(ICU OPTIONAL_COMPONENTS i18n lx) ++ find_package(ICU OPTIONAL_COMPONENTS i18n lx uc) + endif() + endif() + endif() +@@ -267,6 +267,7 @@ if(NOT OPTION_DEDICATED) + link_package(Fontconfig TARGET Fontconfig::Fontconfig) + link_package(ICU_lx) + link_package(ICU_i18n) ++ link_package(ICU_uc) + + if(SDL2_FOUND AND OPENGL_FOUND AND UNIX) + # SDL2 dynamically loads OpenGL if needed, so do not link to OpenGL when diff --git a/games-simulation/openttd/files/openttd-14.1-icu-76.1.patch b/games-simulation/openttd/files/openttd-14.1-icu-76.1.patch new file mode 100644 index 000000000000..3508e8dc9908 --- /dev/null +++ b/games-simulation/openttd/files/openttd-14.1-icu-76.1.patch @@ -0,0 +1,34 @@ +https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e + +From 14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e Mon Sep 17 00:00:00 2001 +From: fundawang <fundawang@yeah.net> +Date: Tue, 5 Nov 2024 19:12:34 +0800 +Subject: [PATCH] Fix: build with icu >= 76 where icu-i18n and icu-uc become + separated (#13048) + +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 137eb7d0f8ce9..2f0248047506a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ if(NOT OPTION_DEDICATED) + find_package(Fontconfig) + endif() + find_package(Harfbuzz) +- find_package(ICU OPTIONAL_COMPONENTS i18n) ++ find_package(ICU OPTIONAL_COMPONENTS i18n uc) + endif() + endif() + endif() +@@ -331,6 +331,7 @@ if(NOT OPTION_DEDICATED) + link_package(Fontconfig TARGET Fontconfig::Fontconfig) + link_package(Harfbuzz TARGET harfbuzz::harfbuzz) + link_package(ICU_i18n) ++ link_package(ICU_uc) + + if(SDL2_FOUND AND OPENGL_FOUND AND UNIX) + # SDL2 dynamically loads OpenGL if needed, so do not link to OpenGL when + diff --git a/games-simulation/openttd/openttd-13.4.ebuild b/games-simulation/openttd/openttd-13.4.ebuild index 11d583b49c7f..c647f80d4818 100644 --- a/games-simulation/openttd/openttd-13.4.ebuild +++ b/games-simulation/openttd/openttd-13.4.ebuild @@ -65,6 +65,7 @@ DOCS=( docs/directory_structure.md ) PATCHES=( "${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch" "${FILESDIR}/${PN}-13.4-gcc15.patch" + "${FILESDIR}/${PN}-13.4-icu-76.1.patch" ) src_prepare() { diff --git a/games-simulation/openttd/openttd-14.1.ebuild b/games-simulation/openttd/openttd-14.1.ebuild new file mode 100644 index 000000000000..dcc100476de9 --- /dev/null +++ b/games-simulation/openttd/openttd-14.1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="A clone of Transport Tycoon Deluxe" +HOMEPAGE="https://www.openttd.org/" +SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib" +REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )" + +RDEPEND=" + net-misc/curl + dedicated? ( + acct-group/openttd + acct-user/openttd + app-misc/dtach + ) + !dedicated? ( + allegro? ( media-libs/allegro:5 ) + fluidsynth? ( media-sound/fluidsynth ) + icu? ( + >=dev-libs/icu-58.1:= + media-libs/harfbuzz + ) + sdl? ( media-libs/libsdl2[sound,video] ) + truetype? ( + media-libs/fontconfig + media-libs/freetype:2 + sys-libs/zlib:= + ) + ) + lzma? ( app-arch/xz-utils ) + lzo? ( dev-libs/lzo:2 ) + png? ( media-libs/libpng:= ) + zlib? ( sys-libs/zlib:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=games-util/grfcodec-6.0.6_p20210310 + virtual/pkgconfig +" +PDEPEND=" + !dedicated? ( + openmedia? ( + >=games-misc/openmsx-0.4.0 + >=games-misc/opensfx-1.0.1 + ) + ) + openmedia? ( >=games-misc/opengfx-0.6.1 ) + timidity? ( media-sound/timidity++ ) +" + +DOCS=( docs/directory_structure.md ) + +PATCHES=( + "${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch" + "${FILESDIR}/${PN}-13.4-gcc15.patch" + "${FILESDIR}/${PN}-14.1-icu-76.1.patch" +) + +src_prepare() { + # Drop automagic LTO usage + sed -i -e '/check_ipo_supported(RESULT IPO_FOUND)/d' CMakeLists.txt || die + + # Don't force _FORTIFY_SOURCE via CMake + # (we already set it in the toolchain by default with a minimum level + # of _FORTIFY_SOURCE=2) + sed -i -e '/-D_FORTIFY_SOURCE/d' cmake/CompileFlags.cmake || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_BINDIR=bin + -DCMAKE_INSTALL_DATADIR=share + -DOPTION_DEDICATED=$(usex dedicated) + -DOPTION_USE_ASSERTS=$(usex debug) + -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro) + -DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype) + -DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype) + -DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth) + -DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu) + -DCMAKE_DISABLE_FIND_PACKAGE_Harfbuzz=$(usex !icu) + -DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma) + -DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo) + -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png) + # N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only + # with USE="allegro -sdl" combination flags. There no other way to + # completely disable SDL1 support. + -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl) + -DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse) + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use dedicated ; then + newconfd "${FILESDIR}"/openttd.confd-r1 openttd + newinitd "${FILESDIR}"/openttd.initd-r3 openttd + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + if ! use openmedia ; then + elog + elog "OpenTTD was compiled without the 'openmedia' USE flag." + elog + elog "In order to play, you must at least install" + elog "games-misc/opengfx, and games-misc/opensfx, or copy the " + elog "following 6 files from a version of Transport Tycoon Deluxe" + elog "(Windows or DOS) to shared or personal location." + elog "See ${EROOT}/usr/share/doc/${PF}/directory_structure.md for more info." + elog + elog "From the Windows version you need: " + elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" + elog "OR from the DOS version you need: " + elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" + fi +} diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-c23.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-c23.patch new file mode 100644 index 000000000000..b9a61a24a452 --- /dev/null +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-c23.patch @@ -0,0 +1,11 @@ +sort_by_score appeared twice. +--- a/src/global.h ++++ b/src/global.h +@@ -411,7 +411,6 @@ extern int score(int warnum); + extern void sort_by_score(int *idxV, int *scrV); + extern int deaths(int warnum); + extern void results(FILE * outp); +-extern void sort_by_score(); + extern void Exit(int code); + extern void reset_regs(void); + extern void set_reg(char regChr, long val); diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-ncurses-opaque.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-ncurses-opaque.patch new file mode 100644 index 000000000000..543ece1d6ce5 --- /dev/null +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-ncurses-opaque.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/932139 +https://github.com/mbarbon/pMARS/commit/a39970c724591c3c8625819cab7ca298ae71e12d +--- a/src/curdisp.c ++++ b/src/curdisp.c +@@ -428,18 +428,18 @@ agets5(str, maxchar, attr) + str--; + maxchar++; + leaveok(curwin, TRUE); +- if (ox = curwin->_curx) { ++ if (ox = getcurx(curwin)) { + #if 0 + #ifdef ATTRIBUTE +- mvwaddch(curwin, curwin->_cury, --ox, ' ' | attr); ++ mvwaddch(curwin, getcury(curwin), --ox, ' ' | attr); + #else +- mvwaddch(curwin, curwin->_cury, --ox, ' '); ++ mvwaddch(curwin, getcury(curwin), --ox, ' '); + #endif + #endif /* 0 */ +- mvwaddch(curwin, curwin->_cury, --ox, ' '); +- wmove(curwin, curwin->_cury, ox); ++ mvwaddch(curwin, getcury(curwin), --ox, ' '); ++ wmove(curwin, getcury(curwin), ox); + } else { +- oy = curwin->_cury - 1; ++ oy = getcury(curwin) - 1; + #if 0 + #ifdef ATTRIBUTE + mvwaddch(curwin, oy, COLS - 1, ' ' | attr); +@@ -470,12 +470,12 @@ agets5(str, maxchar, attr) + if (ox--) + #if 0 + #ifdef ATTRIBUTE +- mvwaddch(curwin, curwin->_cury, ox, ' ' | attr); ++ mvwaddch(curwin, getcury(curwin), ox, ' ' | attr); + #else +- mvwaddch(curwin, curwin->_cury, ox, ' '); ++ mvwaddch(curwin, getcury(curwin), ox, ' '); + #endif + #endif /* 0 */ +- mvwaddch(curwin, curwin->_cury, ox, ' '); ++ mvwaddch(curwin, getcury(curwin), ox, ' '); + else + #if 0 + #ifdef ATTRIBUTE diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r2.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r2.ebuild new file mode 100644 index 000000000000..ee9eb60c147c --- /dev/null +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs readme.gentoo-r1 + +MY_PN="${PN/-sdl/}" +MY_PV="${PV/e/-5}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Portable redcode simulator's sdl port for core war" +HOMEPAGE="https://corewar.co.uk/pihlaja/pmars-sdl/" +SRC_URI="https://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="sdl X" + +RDEPEND=" + sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) + X? ( x11-libs/libX11 ) + !sdl? ( !X? ( sys-libs/ncurses:0= ) ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-format.patch + "${FILESDIR}"/${P}-ncurses-opaque.patch + "${FILESDIR}"/${P}-c23.patch +) + +DOC_CONTENTS=" + There are some macros in /usr/share/pmars/macros + which you should make accessible to pmars by typing + export PMARSHOME=/usr/share/pmars/macros\n +" + +src_compile() { + local LIB="" + export LFLAGS="-x" + + append-cppflags -DEXT94 -DPERMUTATE + + if use sdl ; then + append-cflags $(sdl-config --cflags) + append-cppflags -DSDLGRAPHX + + LIB="$(sdl-config --libs)" + elif use X ; then + append-cppflags -DXWINGRAPHX + + LIB="$($(tc-getPKG_CONFIG) --libs x11)" + else + append-cppflags -DCURSESGRAPHX + + LIB="$($(tc-getPKG_CONFIG) --libs ncurses)" + fi + + cd src || die + + local programs=( + asm.c + cdb.c + clparse.c + disasm.c + eval.c + global.c + pmars.c + sim.c + pos.c + str_eng.c + token.c + ) + + for program in "${programs[@]}" ; do + einfo "Compiling ${program}" + $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${program} -c || die + done + + einfo "Linking with LIB: ${LIB}" + $(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die +} + +src_install() { + dobin src/${MY_PN} + doman doc/${MY_PN}.6 + + dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref + readme.gentoo_create_doc + + insinto /usr/share/${MY_PN}/warriors + doins warriors/* + + insinto /usr/share/${MY_PN}/macros + doins config/*.mac +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/games-simulation/simutrans-paksets/metadata.xml b/games-simulation/simutrans-paksets/metadata.xml index 56d5fb39c126..548fcad7b163 100644 --- a/games-simulation/simutrans-paksets/metadata.xml +++ b/games-simulation/simutrans-paksets/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@tastytea.de</email> - <name>Ronny (tastytea) Gutbrod</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">simutrans</remote-id> <remote-id type="github">simutrans/pak128</remote-id> diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml index 6644d41a4ecb..4320d12d54ac 100644 --- a/games-simulation/simutrans/metadata.xml +++ b/games-simulation/simutrans/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@tastytea.de</email> - <name>Ronny (tastytea) Gutbrod</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">simutrans</remote-id> <remote-id type="github">aburch/simutrans</remote-id> |