* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2019-12-02 21:16 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2019-12-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 17dfc81196111be67a038944a8a597349a24c397
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 1 14:08:28 2019 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 2 21:13:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17dfc811
games-simulation/openrct2: drop old version
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-simulation/openrct2/Manifest | 3 -
.../openrct2-0.2.1-disable-tests-with-assets.patch | 50 ---------
games-simulation/openrct2/metadata.xml | 1 -
games-simulation/openrct2/openrct2-0.2.1.ebuild | 122 ---------------------
4 files changed, 176 deletions(-)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 6b447756bce..95e80e71498 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,7 +1,4 @@
-DIST openrct2-0.2.1.tar.gz 6571807 BLAKE2B f5a72072ce4cda9b68d1f82f56932f1a074c4ea4050d63e4bf39de1220544d543265c67f764f85d0cc85b6ff42f3fa67fc71e7dd9c5eacb1881be47e2d79a84f SHA512 04bf2cfbb2d3b9fb0a8423cfffc70b81a2a2518af73b9a2c2c65b2a4e5ef2380621d4d3aaefaea73d926a99259dfb047d6fcc330cd0d7227541cffead28ba540
DIST openrct2-0.2.4.tar.gz 6805976 BLAKE2B 7860746d1705804682756097ff37d4584d0ebb20c450c08b88134795e9f3c375dfb888a67302f530cd55700eaa5cd13149c365c30a5d267d382b39225f06d210 SHA512 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03
DIST openrct2-objects-1.0.12.zip 2173875 BLAKE2B d344dde3dc376004b9e303a489c058a574c2f8babcce8c9998ef12f2b91e3fe7d3e22e1afc81aadd39637f3f91a5d36c4267aed06980686fd909cc515f4c8fde SHA512 d17d2197b66d22e33a246651a0c544a49a6d6a809612d26a851dc4b40bb9e1bf5079bbe5b1a3b7d41f541fc41ce41717d772a5579aa2cdc9ec1dfea72b5a3144
-DIST openrct2-objects-v1.0.7.zip 2164242 BLAKE2B 003baf3400c52e3b2efdc208f6c64a45f7c9274aca3b729856a60fc1e72c8b6440b663d3fd791ebde7412df9920095367763bcad58257534b32c222d97976dcb SHA512 8e77adae59062582a22be69e81d144477482148c839abbea76e6bbbc65ca6426a8354bd4726176702a41684f01a62c5bddc0f6c2c6e42fa91c88815879c91fe5
DIST openrct2-replays-0.0.4.zip 1098833 BLAKE2B efe4f72b16285d8e6508313f16b892b02f1b124cf9b4d146731280f5090d071d3351834e6d4ab51122804fbbcb49044be4e681182141aac93795c3b1953b6590 SHA512 5c2469bfdaa94a6007f6788878f4e80d87fbbfd48b522e1bd2a22c2aa0c98583159b9559fd45f7f9450d544a99a59b6c17399d9ac91a171a86135f0e1a5b3e71
-DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
diff --git a/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch b/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch
deleted file mode 100644
index a4f1e237532..00000000000
--- a/games-simulation/openrct2/files/openrct2-0.2.1-disable-tests-with-assets.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 86b45a7a4a4fc9b038bcd0e720cf575b934fb462 Mon Sep 17 00:00:00 2001
-From: "Hendrik v. Raven" <hendrik@consetetur.de>
-Date: Sat, 4 Aug 2018 13:58:31 +0200
-Subject: [PATCH] reintroduce DISABLE_RCT2_TESTS compile option
-
-the option was removing when restructuring the CI system, but it is
-still usefull for package maintainers.
----
- test/tests/CMakeLists.txt | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/test/tests/CMakeLists.txt b/test/tests/CMakeLists.txt
-index 1f862153d..34ab5c884 100644
---- a/test/tests/CMakeLists.txt
-+++ b/test/tests/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 2.6)
-
-+option(DISABLE_RCT2_TESTS "Disable tests that require RollerCoaster Tycoon 2 assets.")
- option(SYSTEM_GTEST "Use the googletest library provided by the system.")
-
- if (SYSTEM_GTEST)
-@@ -172,18 +173,21 @@ set(RIDE_RATINGS_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/RideRatings.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_ride_ratings ${RIDE_RATINGS_TEST_SOURCES})
- target_link_libraries(test_ride_ratings ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME ride_ratings COMMAND test_ride_ratings)
-
- # Multi-launch test
- set(MULTILAUNCH_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/MultiLaunch.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_multilaunch ${MULTILAUNCH_TEST_SOURCES})
- target_link_libraries(test_multilaunch ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME multilaunch COMMAND test_multilaunch)
-
- # Tile element test
- set(TILE_ELEMENT_TEST_SOURCES "${CMAKE_CURRENT_LIST_DIR}/TileElements.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/TestData.cpp")
- add_executable(test_tile_elements ${TILE_ELEMENT_TEST_SOURCES})
- target_link_libraries(test_tile_elements ${GTEST_LIBRARIES} libopenrct2 ${LDL} z)
--add_test(NAME tile_elements COMMAND test_tile_elements)
-+
-+if (NOT DISABLE_RCT2_TESTS)
-+ add_test(NAME ride_ratings COMMAND test_ride_ratings)
-+ add_test(NAME multilaunch COMMAND test_multilaunch)
-+ add_test(NAME tile_elements COMMAND test_tile_elements)
-+endif ()
---
-2.18.0
-
diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
index 9fce1c161ff..95e51ef2b73 100644
--- a/games-simulation/openrct2/metadata.xml
+++ b/games-simulation/openrct2/metadata.xml
@@ -28,7 +28,6 @@
</longdescription>
<use>
<flag name="lightfx">Enables LightFX for better lightning effects.</flag>
- <flag name="multiplayer">Enable multiplayer functionality</flag>
<flag name="twitch">Enables streaming of ingame content to Twitch.</flag>
</use>
<upstream>
diff --git a/games-simulation/openrct2/openrct2-0.2.1.ebuild b/games-simulation/openrct2/openrct2-0.2.1.ebuild
deleted file mode 100644
index d8620527030..00000000000
--- a/games-simulation/openrct2/openrct2-0.2.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
- EGIT_BRANCH="develop"
- inherit git-r3
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
- S="${WORKDIR}/OpenRCT2-${PV}"
-fi
-
-TSV="0.1.2"
-OBJV="1.0.7"
-SRC_URI+="
- https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip
- -> ${PN}-title-sequence-v${TSV}.zip
- https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip
- -> ${PN}-objects-v${OBJV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl +multiplayer opengl test truetype +twitch"
-
-RDEPEND="
- >=dev-libs/jansson-2.5
- >=dev-libs/libzip-1.0
- media-libs/libpng:0=
- media-libs/libsdl2
- media-libs/speexdsp
- multiplayer? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- )
- opengl? ( virtual/opengl )
- truetype? (
- media-libs/sdl2-ttf
- media-libs/fontconfig
- )
- twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
- app-arch/unzip
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.2.1-disable-tests-with-assets.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- unpack ${P}.tar.gz
- fi
-
- mkdir -p "${S}/data/title" || die
- pushd "${S}/data/title" || die
- unpack ${PN}-title-sequence-v${TSV}.zip
- popd || die
-
- mkdir -p "${S}/data/object" || die
- pushd "${S}/data/object" || die
- unpack ${PN}-objects-v${OBJV}.zip
- popd || die
-}
-
-src_prepare() {
- sed -i CMakeLists.txt -e 's/-Werror//' || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DDISABLE_HTTP_TWITCH="$(usex !twitch)"
- -DDISABLE_NETWORK="$(usex !multiplayer)"
- -DDISABLE_OPENGL="$(usex !opengl)"
- -DDISABLE_TTF="$(usex !truetype)"
- -DWITH_TESTS="$(usex test)"
- -DDOWNLOAD_TITLE_SEQUENCES=OFF
- -DDOWNLOAD_OBJECTS=OFF
- -DBUILD_SHARED_LIBS=ON
- )
- if use test ; then
- mycmakeargs+=(
- -DSYSTEM_GTEST=ON
- -DDISABLE_RCT2_TESTS=ON
- )
- fi
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- ewarn ""
- ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
- ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
- ewarn ""
- fi
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2022-04-27 20:08 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2022-04-27 20:08 UTC (permalink / raw
To: gentoo-commits
commit: a842ee787e7808305494b309969e233f50dc39d0
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 19:58:02 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 20:08:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a842ee78
games-simulation/openrct2: bump to 0.4.0
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-simulation/openrct2/Manifest | 6 ++++--
.../openrct2-0.4.0-include-additional-paths.patch | 18 ++++++++++++++++++
...{openrct2-9999.ebuild => openrct2-0.4.0.ebuild} | 22 ++++++++++------------
games-simulation/openrct2/openrct2-9999.ebuild | 8 ++++----
4 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 97cca94ac7a4..711cad0443aa 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,6 +1,8 @@
DIST openrct2-0.3.5.1.tar.gz 14178153 BLAKE2B a1f15fd427392195502e917f1fd4d8064a2905c1995c9e94157073c6acc026d1f716fb06294768630aa75d104d7c851388c72c38653e4804deeb8237b4a31c00 SHA512 0e36db302631b75aa1411eca945bddd1120997efbc48ba9172887f834670f34e345b8c96f363cdc8791d94bb4df32f6e70e30001989c194a8c525e2614241c84
+DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
-DIST openrct2-objects-1.2.4.zip 3392474 BLAKE2B 5f539cbbdd93828cebfa6977c6c11ac878c3ec39e0b937ddf00e598f874ccf5f1822e02d6c7e508a42e2ee01242b304b013f07d16dbf94085191b62f76b8dbfb SHA512 910538010d1258f73f8290dd79ef24f463e2afcf0e5876b5f7b6a0671250fbea11180474440df6f0c3d6c356948c5f7a305a44214b53695dc26f15158dfd5214
+DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
-DIST openrct2-replays-0.0.62.zip 1466858 BLAKE2B 651e46a554e90d7692c2dc0f8dcffaadb58ffaf7f9a282d499f4c032c8412730da58f660d03b0e73d26893ce7b9a3a437029893acd7f3fd4e9267ce85eb0ee68 SHA512 69705858ebde1dc9a698915c0d5ed56e1c9d5cb29b919d99eebefe81fdb68d9c17acc58431618410b69cf67ad14e1994ec9ac86530127ca87cdc5603de899137
+DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
+DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
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
new file mode 100644
index 000000000000..b90d48c63c33
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.0-include-additional-paths.patch
@@ -0,0 +1,18 @@
+--- 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/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-0.4.0.ebuild
similarity index 91%
copy from games-simulation/openrct2/openrct2-9999.ebuild
copy to games-simulation/openrct2/openrct2-0.4.0.ebuild
index 293da48f84c1..4a5b89ba4216 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.0.ebuild
@@ -3,31 +3,31 @@
EAPI=8
-inherit cmake git-r3 readme.gentoo-r1 xdg-utils
-
-EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
-EGIT_BRANCH="develop"
+inherit cmake readme.gentoo-r1 xdg-utils
MY_PN="OpenRCT2"
MY_PN_OBJ="objects"
MY_PN_RPL="replays"
MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.2.4"
-MY_PV_RPL="0.0.62"
-MY_PV_TS="0.1.2c"
+MY_PV_OBJ="1.2.7"
+MY_PV_RPL="0.0.67"
+MY_PV_TS="0.4.0"
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_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.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=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="dedicated +lightfx +opengl scripting test +truetype"
+RESTRICT="!test? ( test )"
COMMON_DEPEND="
dev-libs/icu:=
@@ -68,15 +68,13 @@ BDEPEND="
virtual/pkgconfig
"
-RESTRICT="!test? ( test )"
-
PATCHES=(
- "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+ "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
)
src_unpack() {
- git-r3_src_unpack
+ unpack "${P}".tar.gz
mkdir -p "${S}"/data/sequence || die
cd "${S}"/data/sequence || die
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 293da48f84c1..cd60805a4bee 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -12,9 +12,9 @@ MY_PN="OpenRCT2"
MY_PN_OBJ="objects"
MY_PN_RPL="replays"
MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.2.4"
-MY_PV_RPL="0.0.62"
-MY_PV_TS="0.1.2c"
+MY_PV_OBJ="1.2.7"
+MY_PV_RPL="0.0.67"
+MY_PV_TS="0.4.0"
DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
HOMEPAGE="https://openrct2.org/"
@@ -71,8 +71,8 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
+ "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2022-07-09 21:30 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2022-07-09 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 2ba03a2f0bc4d7e5f16e9a98b8e3b286684d900a
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 21:02:06 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 21:29:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba03a2f
games-simulation/openrct2: add 0.4.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-simulation/openrct2/Manifest | 2 +
.../openrct2/files/openrct2-0.4.1-gtest-1.10.patch | 8 +
games-simulation/openrct2/openrct2-0.4.1.ebuild | 164 +++++++++++++++++++++
3 files changed, 174 insertions(+)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 12bcabc744f6..1958d324c2af 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,4 +1,6 @@
DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
+DIST openrct2-0.4.1.tar.gz 14307739 BLAKE2B d50dd896128898725eb7bd347341dc23a5ef4e8c83d3334625f5484dc5d4214a6ba19981997291de3edb80baaf498e9b4fd83b460a2fd4fdc2100c080d3d0bb6 SHA512 795e94b025ebe8ce4386e59723e2442e950810652a1c95caa1e21a88bef5417c2cce18c93418788e75cd8e980ffda0dc73838693fbe2be108a4e269da9159f06
DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
+DIST openrct2-objects-1.3.2.zip 3954437 BLAKE2B 21d79e35a3bad343a4f96e152f8b5f04820fc927557f0526e639f7c04ca1fac61804db02be57261deb01d65c81f67783ba9ed8e0230a90b2626fa2b63ed82857 SHA512 88b292961d728c1ad31dd9f68ba9a1201a59126887030b7b4a8d9fdbed758c1b9bd4f29fb924ddd3cf7b4c5fb7c95f576a00fabdef5a8403e287edeb1c740ff1
DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
diff --git a/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch
new file mode 100644
index 000000000000..1a9eba0fb3e3
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.1-gtest-1.10.patch
@@ -0,0 +1,8 @@
+--- a/test/tests/ReplayTests.cpp
++++ b/test/tests/ReplayTests.cpp
+@@ -115,4 +115,5 @@
+ }
+ };
+
++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests);
+ INSTANTIATE_TEST_SUITE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter());
diff --git a/games-simulation/openrct2/openrct2-0.4.1.ebuild b/games-simulation/openrct2/openrct2-0.4.1.ebuild
new file mode 100644
index 000000000000..086cc24d58f0
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 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_OBJ="objects"
+MY_PN_RPL="replays"
+MY_PN_TS="title-sequences"
+MY_PV_OBJ="1.3.2"
+MY_PV_RPL="0.0.67"
+MY_PV_TS="0.4.0"
+
+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_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.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 x86"
+IUSE="dedicated +lightfx +opengl scripting test +truetype"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-libs/icu:=
+ dev-libs/jansson:=
+ dev-libs/libzip:=
+ media-libs/libpng:0=
+ net-misc/curl[ssl]
+ sys-libs/zlib
+ !dedicated? (
+ media-libs/libsdl2
+ media-libs/speexdsp
+ opengl? ( virtual/opengl )
+ )
+ 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/sequence || die
+ cd "${S}"/data/sequence || die
+ unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
+
+ mkdir -p "${S}"/data/object || die
+ cd "${S}"/data/object || die
+ unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".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
+ -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)
+ -DDOWNLOAD_OBJECTS=OFF
+ -DDOWNLOAD_REPLAYS=OFF
+ -DDOWNLOAD_TITLE_SEQUENCES=OFF
+ -DENABLE_LIGHTFX=$(usex lightfx)
+ -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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2023-11-16 20:38 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2023-11-16 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 1d19803e7db93e18bc890f10079177319dc6b563
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 20:37:02 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 20:37:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d19803e
games-simulation/openrct2: fix compilation with gcc14
Closes: https://bugs.gentoo.org/917016
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../openrct2/files/openrct2-0.4.6-gcc14.patch | 30 ++++++++++++++++++++++
games-simulation/openrct2/openrct2-0.4.6.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch b/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch
new file mode 100644
index 000000000000..2c2c00fff5e7
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.6-gcc14.patch
@@ -0,0 +1,30 @@
+From 11c46987aed7f8ef941140a171d55abc8cd8d0d5 Mon Sep 17 00:00:00 2001
+From: Kostadin <kocelfc@tutanota.com>
+Date: Thu, 16 Nov 2023 22:26:05 +0200
+Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14 (#20981)
+
+With gcc 14 some C++ Standard Library headers have been changed to no
+longer include other headers that were used internally by the library.
+In OpenRCT2's case it is the <algorithm> header.
+
+Downstream Gentoo bug: https://bugs.gentoo.org/917016
+
+GCC 14 porting guide: https://gcc.gnu.org/gcc-14/porting_to.html#header-dep-changes
+
+Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com>
+---
+ src/openrct2/core/FileWatcher.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/openrct2/core/FileWatcher.cpp b/src/openrct2/core/FileWatcher.cpp
+index 439be15859ed..3ce0309c8cc8 100644
+--- a/src/openrct2/core/FileWatcher.cpp
++++ b/src/openrct2/core/FileWatcher.cpp
+@@ -7,6 +7,7 @@
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
++#include <algorithm>
+ #include <array>
+ #include <cstdio>
+ #include <stdexcept>
diff --git a/games-simulation/openrct2/openrct2-0.4.6.ebuild b/games-simulation/openrct2/openrct2-0.4.6.ebuild
index 64107568e416..3049ac705a1b 100644
--- a/games-simulation/openrct2/openrct2-0.4.6.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.6.ebuild
@@ -73,6 +73,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+ "${FILESDIR}/${PN}-0.4.6-gcc14.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2024-10-11 13:37 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2024-10-11 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 892f2d911bd2385d68e84d1dd8e5e642dfd94211
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 13:34:55 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 13:34:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892f2d91
games-simulation/openrct2: add correct path patch
Closes: https://bugs.gentoo.org/941262
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../openrct2-0.4.15-include-additional-paths.patch | 17 +++++++++++++++++
games-simulation/openrct2/openrct2-0.4.15.ebuild | 2 +-
games-simulation/openrct2/openrct2-9999.ebuild | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch
new file mode 100644
index 000000000000..16d306260e67
--- /dev/null
+++ b/games-simulation/openrct2/files/openrct2-0.4.15-include-additional-paths.patch
@@ -0,0 +1,17 @@
+--- a/src/openrct2/platform/Platform.Linux.cpp
++++ b/src/openrct2/platform/Platform.Linux.cpp
+@@ -335,12 +335,12 @@
+
+ std::vector<std::string_view> GetSearchablePathsRCT1()
+ {
+- return {};
++ return { "/usr/share/openrct2/rct1_data" };
+ }
+
+ std::vector<std::string_view> GetSearchablePathsRCT2()
+ {
+- return {};
++ return { "/usr/share/openrct2/rct2_data" };
+ }
+
+ # ifndef NO_TTF
diff --git a/games-simulation/openrct2/openrct2-0.4.15.ebuild b/games-simulation/openrct2/openrct2-0.4.15.ebuild
index 2ce516a11c9a..efb5b081135e 100644
--- a/games-simulation/openrct2/openrct2-0.4.15.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.15.ebuild
@@ -77,8 +77,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
+ "${FILESDIR}/${PN}-0.4.15-include-additional-paths.patch"
)
src_unpack() {
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 72f2a309f584..cc9b7bfd01b4 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -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.5-include-additional-paths.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2024-11-09 1:41 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2024-11-09 1:41 UTC (permalink / raw
To: gentoo-commits
commit: 552cf34db9d026c11fe203a81ebdbbbea32d241a
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 01:13:15 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 01:29:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=552cf34d
games-simulation/openrct2: add 0.4.16
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-simulation/openrct2/Manifest | 3 +
.../openrct2-0.4.16-include-additional-paths.patch | 18 +++
games-simulation/openrct2/openrct2-0.4.16.ebuild | 180 +++++++++++++++++++++
3 files changed, 201 insertions(+)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index d4b1580484a7..b7d31b84610f 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,5 +1,7 @@
DIST openrct2-0.4.14.tar.gz 21917635 BLAKE2B 0fc5a105a416a1a9634ca90542c5234e19da534f07554c1f278b75a1209158d3783cfd69fad1e492140788f9cf3716f5e943391c7787015ae038ccaf7da8765d SHA512 11eaec800aee9667d1a9d5f255f556572221b5f2190740d16c847e23bb1feb75fcb3876c4078ca069517eda72a27fb22f5c6fb91458bdf66dfe1f8ab51bd4e07
DIST openrct2-0.4.15.tar.gz 22045224 BLAKE2B dd0faca7bc4a8d2b5b7b82a087520c6b2a2351481b04c7a2f69e65546428772757df7fd241e8c42adf75eed5f2f94e50d57bbffa6a96e6b50268c1d6fd93045e SHA512 c9dd483993e53addb40097bab87e040bca4f87b8708118ccf4f9aa91a645ee9805f3ceed0cedc4f08b2ea7eb172a3ceac63a1df5f123b40a44cca548b86269af
+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-objects-1.4.7.zip 5411765 BLAKE2B 0ac59fbee6d22f832f52f03ad6e4e15bd60ba1955fc7a8f9deaf8fd114483cfdf20cd8ced42494716bf7a1d8dbeb7969cb1fa3852ae11e9afb0819c90ae6d389 SHA512 54f6872502333dc4063d0eca6d9e2cb6f7e6c7593be014a3c17df3b9a6dfa354b50c995953fb56973db8cef3733eedb3b64e680fe136724328156c1c590d9ae7
DIST openrct2-objects-1.4.8.zip 5415469 BLAKE2B 685b2c0493fb367c0eb2087b486cc76b3ff86d6a6400812f13041b2298d63f881760aa6fe538ceea775b7a72b8997a1fbd2611152436057b9d749105e539cae1 SHA512 b25fbb751a8b0ee63aa76fc8559192bc32531019c4c03a27c638cf35be54b5f491c45372b1db94187b6865d0adbf0e29248d43d6b26fde7b829a7138d01d09c6
DIST openrct2-openmusic-1.5.zip 40548101 BLAKE2B 11cf46a54716097038e134ae11aeb23823097ca96189dabeb0e43d7050d5e776aa309c38de247da15b1eec7ed6be6299d5673a92df1323cc3a4a5bbc4f48d567 SHA512 55d4afb854eaa5a69c42e7f0b26669c8fb58b2eba3e2892c655e76d8fab82e2734f39981d7f5ac69e11dc87d06c89795da2468feac3bc53ef6cfdd992e3924f3
@@ -7,4 +9,5 @@ DIST openrct2-openmusic-1.6.zip 42921141 BLAKE2B fff3ac6d944ed2021645c064de3daf8
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.80.zip 1830711 BLAKE2B b21d658e9e3423fc4cce4a688205660530b576243cb4fefdcbeaa6312e5979052182a51ed9418339c6fcacb6e4c78dfdb617db1934ca51950ea4f89927220f8e SHA512 a6019773e0178d3fa6968f04a5880c27e92cdd270355ddb5b9616b7a9f793a0cb09c246a82d3dd2f6bbf9f2f354a903a9bc4344fafb68532d695513ace7c6922
+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
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/openrct2-0.4.16.ebuild b/games-simulation/openrct2/openrct2-0.4.16.ebuild
new file mode 100644
index 000000000000..c15629877f5a
--- /dev/null
+++ b/games-simulation/openrct2/openrct2-0.4.16.ebuild
@@ -0,0 +1,180 @@
+# 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.6"
+MY_PV_OBJ="1.4.10"
+MY_PV_RPL="0.0.83"
+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.1-gtest-1.10.patch"
+ "${FILESDIR}/${PN}-0.4.16-include-additional-paths.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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/
@ 2024-11-23 23:36 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2024-11-23 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 2f5fc1cb62aada859e90353a8647dd4931ab91e3
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 23:44:15 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 23:32:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5fc1cb
games-simulation/openrct2: fix build
Closes: https://bugs.gentoo.org/943038
Closes: https://bugs.gentoo.org/941519
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../openrct2/files/openrct2-0.4.16-tileelement.patch | 10 ++++++++++
games-simulation/openrct2/openrct2-0.4.16.ebuild | 1 +
2 files changed, 11 insertions(+)
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.16.ebuild b/games-simulation/openrct2/openrct2-0.4.16.ebuild
index c15629877f5a..378331630e73 100644
--- a/games-simulation/openrct2/openrct2-0.4.16.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.16.ebuild
@@ -79,6 +79,7 @@ BDEPEND="
PATCHES=(
"${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() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-11-23 23:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-16 20:38 [gentoo-commits] repo/gentoo:master commit in: games-simulation/openrct2/files/, games-simulation/openrct2/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2024-11-23 23:36 Conrad Kostecki
2024-11-09 1:41 Conrad Kostecki
2024-10-11 13:37 Conrad Kostecki
2022-07-09 21:30 Conrad Kostecki
2022-04-27 20:08 Conrad Kostecki
2019-12-02 21:16 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox