diff options
Diffstat (limited to 'games-simulation')
17 files changed, 166 insertions, 275 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz Binary files differindex 342ba7addf95..0d967dc61cbd 100644 --- a/games-simulation/Manifest.gz +++ b/games-simulation/Manifest.gz diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest index f30ed773ba15..1dada5469667 100644 --- a/games-simulation/corsix-th/Manifest +++ b/games-simulation/corsix-th/Manifest @@ -1,6 +1,5 @@ AUX corsix-th-0.67-cmake_lua_detection.patch 965 BLAKE2B 3b1ec0a795793efd3a6765b83eeea503e624e778221426775f11bab6fbf03eca9da2265358111d816a8b8c0f0c3dc86a976e476d2732ec311d42a6177296a4db SHA512 5b375b190699e0dbd23c1f2683a0a065fe41f748ba492c2dfcc7d8eac7e9695119e392faa1c39eaa20b5a0093b479b9cf602ffef1bb260c27dc388e3ecce9f97 -DIST corsix-th-0.67.tar.gz 4127698 BLAKE2B 3b95b2439b779eab88a680fc3543fc4695cab7eac09ec2b20f892e95faaaf176c4d6c4862a9cd716958283922a7a6d8d1011346f1ef7c7a2f43ccca0c0b076c6 SHA512 b0e245a8aed9ad36e1040f88bbf8bf031bddf8dead0c59bc99a3c7f19cd6957c52e8185b2b737e78d57c73a58e460360428c81d5df1f6660aa17c7ec91ac62ba DIST corsix-th-0.68.0.tar.gz 4240659 BLAKE2B 9823e90927a63591384de49dde3cdcaced9fd1221931dacad0a5d115d0fcee2c9616b1a6785e91170c23a653f4bccbf6438fe352afdda9777078cdbfd84f0fda SHA512 087c20d79d249cff77e037561fb978290af75ff13c02e24c52699fd7b4e8a542e23806b7fde93cfff7d47bd98ee1eda4878cd0d4585e12775a2e6337655a5bbf -EBUILD corsix-th-0.67.ebuild 1866 BLAKE2B 46f4986acbebb7186747f9ad25126b7cbc104aa150b06ab48a49c13b7ff1362f95aa8b1d51720929dad14cdb39eb1d2b3c96e2466862583d3cf08a73ca3415a9 SHA512 2fd0e83c7e78048857918876a1796df32b55283fa66c0e324a2c5932a9633f1de818e5e276974ff7e0461d56133e8757beaec8d6da2759cb712b12ca715c95aa -EBUILD corsix-th-0.68.0.ebuild 1892 BLAKE2B cc87e2022d5fc924721680997d00ea58a57c6ac9580a07c5531ebb79ea247c5754606a48055d550ffe357a66a690cbe651d7fd598d08a2661b0aaddff940e7df SHA512 18f2b09cc38018c2d736757afb9dfae9632fb7f3a926a1de86ea03a6cd8e7f602e615ce46127984189f3b21cc687d81e9684e457a4a0006b8e4f342bcab8ec3b +EBUILD corsix-th-0.68.0.ebuild 2394 BLAKE2B 7bebc89754b95e99b816bbf9311213a0906cbdd76eb8d5459c2390895e979ae8f10d0cac1c974e5a3acf25d106346a2cb55bf0fcc35f428366f5842570f155af SHA512 2fe1e5bb707e2a19ac7527db6968c77a38c060cae23cfce1d69d8b7dd80e9f196850dc5296897a50014b8f0042adb1c3ea0eb3a1a7fa1a1d1e4a5d6e8b047bd4 +EBUILD corsix-th-9999.ebuild 2394 BLAKE2B 7bebc89754b95e99b816bbf9311213a0906cbdd76eb8d5459c2390895e979ae8f10d0cac1c974e5a3acf25d106346a2cb55bf0fcc35f428366f5842570f155af SHA512 2fe1e5bb707e2a19ac7527db6968c77a38c060cae23cfce1d69d8b7dd80e9f196850dc5296897a50014b8f0042adb1c3ea0eb3a1a7fa1a1d1e4a5d6e8b047bd4 MISC metadata.xml 780 BLAKE2B 604dff99fbb107226d6edf80a3648ebb5b7d5793745d4275ed106d8e313cbb2319510490279071807bc5bb293458c96a4f5f7a5e6442e397f2331d62f518d2ae SHA512 38586db6e150a9f87988c32e7e69afef5f079e1b49803452b4655a407bdc810b9d829be2406c278f81e315c11033d43e51afabef1a91c2c84638b6afab706c92 diff --git a/games-simulation/corsix-th/corsix-th-0.68.0.ebuild b/games-simulation/corsix-th/corsix-th-0.68.0.ebuild index 32f0eab26d9f..75849743f032 100644 --- a/games-simulation/corsix-th/corsix-th-0.68.0.ebuild +++ b/games-simulation/corsix-th/corsix-th-0.68.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit cmake lua-single xdg +inherit cmake edo lua-single xdg MY_PN="CorsixTH" MY_PV="${PV/_/-}" @@ -13,16 +13,22 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="Open source clone of Theme Hospital" HOMEPAGE="https://corsixth.com" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}" + inherit git-r3 +else + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_P}" + + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + fi +fi LICENSE="MIT" SLOT="0" -if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi -IUSE="doc +midi +sound tools +truetype +videos" - +IUSE="doc +midi +sound test tools +truetype +videos" +RESTRICT="!test? ( test )" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND="${LUA_DEPS} @@ -52,16 +58,22 @@ BDEPEND=" >=dev-lua/lpeg-0.9[${LUA_USEDEP}] ') ) + test? ( + >=dev-cpp/catch-3:0 + ) " PATCHES=( "${FILESDIR}"/${PN}-0.67-cmake_lua_detection.patch ) +lua_enable_tests busted + src_configure() { local mycmakeargs=( -DLUA_VERSION=$(lua_get_version) -DBUILD_TOOLS=$(usex tools) + -DENABLE_UNIT_TESTS=$(usex test) -DWITH_AUDIO=$(usex sound) -DWITH_FREETYPE2=$(usex truetype) -DWITH_MOVIES=$(usex videos) @@ -76,6 +88,15 @@ src_compile() { use doc && cmake_src_compile doc } +src_test() { + # https://github.com/CorsixTH/CorsixTH/blob/master/.github/workflows/Linux.yml#L88 + # C++ tests + BUILD_DIR="${BUILD_DIR}"/CorsixTH cmake_src_test + + # Lua tests + edo busted --lua="${ELUA}" --output="TAP" --verbose --directory=CorsixTH/Luatest +} + src_install() { cmake_src_install dodoc changelog.txt CONTRIBUTING.md diff --git a/games-simulation/corsix-th/corsix-th-0.67.ebuild b/games-simulation/corsix-th/corsix-th-9999.ebuild index f6b688a4d0a8..75849743f032 100644 --- a/games-simulation/corsix-th/corsix-th-0.67.ebuild +++ b/games-simulation/corsix-th/corsix-th-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-{1..4} ) -inherit cmake lua-single xdg +inherit cmake edo lua-single xdg MY_PN="CorsixTH" MY_PV="${PV/_/-}" @@ -13,16 +13,22 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="Open source clone of Theme Hospital" HOMEPAGE="https://corsixth.com" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}" + inherit git-r3 +else + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_P}" + + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + fi +fi LICENSE="MIT" SLOT="0" -if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi -IUSE="doc +midi +sound tools +truetype +videos" - +IUSE="doc +midi +sound test tools +truetype +videos" +RESTRICT="!test? ( test )" REQUIRED_USE="${LUA_REQUIRED_USE}" RDEPEND="${LUA_DEPS} @@ -52,19 +58,26 @@ BDEPEND=" >=dev-lua/lpeg-0.9[${LUA_USEDEP}] ') ) + test? ( + >=dev-cpp/catch-3:0 + ) " PATCHES=( "${FILESDIR}"/${PN}-0.67-cmake_lua_detection.patch ) +lua_enable_tests busted + src_configure() { local mycmakeargs=( -DLUA_VERSION=$(lua_get_version) -DBUILD_TOOLS=$(usex tools) + -DENABLE_UNIT_TESTS=$(usex test) -DWITH_AUDIO=$(usex sound) -DWITH_FREETYPE2=$(usex truetype) -DWITH_MOVIES=$(usex videos) + -DWITH_UPDATE_CHECK=OFF ) cmake_src_configure @@ -75,6 +88,15 @@ src_compile() { use doc && cmake_src_compile doc } +src_test() { + # https://github.com/CorsixTH/CorsixTH/blob/master/.github/workflows/Linux.yml#L88 + # C++ tests + BUILD_DIR="${BUILD_DIR}"/CorsixTH cmake_src_test + + # Lua tests + edo busted --lua="${ELUA}" --output="TAP" --verbose --directory=CorsixTH/Luatest +} + src_install() { cmake_src_install dodoc changelog.txt CONTRIBUTING.md diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest index cf8f2f69e75e..bdb1d9464925 100644 --- a/games-simulation/flightgear/Manifest +++ b/games-simulation/flightgear/Manifest @@ -1,7 +1,8 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da +AUX flightgear-2020.3.19-CVE-2025-0781.patch 2143 BLAKE2B 8a61b8913ec54ffc550a9faac5a508505b687d24eb750417c1746573725a259a54a2f04731d346b8b5fc3c739737fc4a2d1efa0cbf01142f0fe705096094caed SHA512 7d255bd43da2235a3cf5ad52953aa9f334d78baebcbb0ef96a88267718ebf5ac0236f07066497991cf45ae6a01224012b641497bb3bc823babeaf269511560ae AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb DIST flightgear-2020.3.19.tar.bz2 8935152 BLAKE2B cc4ae515278ced52186683ae44b0ebf0aba9569fac12c5a5646b2a420663154651edcbf7eba18a040127f2d90dbffa1f48000529e8adc944d22fb314ce53c091 SHA512 ad5a4dd455a92bd9032c0f01084c0c114e4a91e60d53f200a754e54e1f8e08fd8e9008ea9f97f69410ee842fdc6c2210091d4ac5e5c6da6ba19f47e22438d207 -EBUILD flightgear-2020.3.19.ebuild 4495 BLAKE2B 5b7e62d71bf5c4f3769e7fe12a578a003a7dabd0b3fe9f7398fcb366d2285421c6f012487666d830e44aa7ccf5b71816e89c57e849999984f31a22ea9cfa9400 SHA512 e620a25cc920fc244a172db151361b0bf01f96420e797ec6c8f6a2f8fab54ea9d274d864dec7afba0814104e444636a552ec5c08035769dad7685c15d1b48f8a +EBUILD flightgear-2020.3.19-r1.ebuild 4546 BLAKE2B 1cea671f857ba147f7a943031e3a324ef4b4b98050bc190bc83d464101dc69c7f33e2a8f3d050ae618c69fbe0f42b98e6cac77a2165cbc152190d78176863a1b SHA512 82c7de6ea084f142faf34603e1a15bc3762c1537705609ff6691b94dd95c30117ca5f244389189d2fc0b48faa76d9f1414a63e6dba098568894ce14814478825 EBUILD flightgear-9999.ebuild 4575 BLAKE2B 5c7e4c47c347d3a39c710b62bd55ceadd13112fc4a26cb61ead0533a48f3064efd54f59bcb5113fb82f90200118fa1cf45e54434dd2db1ab3ce2abdb6cf6fa65 SHA512 328c0651e4077865b7af4c733e3d0c624403ca2e8fd696c9bdc7570e704bc5d7a945f15649e67a33799609d4bcdf64b241ba99ba1dbc811564c77aee87fd6145 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f diff --git a/games-simulation/flightgear/files/flightgear-2020.3.19-CVE-2025-0781.patch b/games-simulation/flightgear/files/flightgear-2020.3.19-CVE-2025-0781.patch new file mode 100644 index 000000000000..eb8e092c5d7a --- /dev/null +++ b/games-simulation/flightgear/files/flightgear-2020.3.19-CVE-2025-0781.patch @@ -0,0 +1,61 @@ +From ad37afce28083fad7f79467b3ffdead753584358 Mon Sep 17 00:00:00 2001 +From: Florent Rougon <f.rougon@frougon.net> +Date: Tue, 21 Jan 2025 00:31:22 +0100 +Subject: [PATCH] NasalSGPath: move checkIORules() to + SGPath::NasalIORulesChecker() + +This allows the from_nasal_helper() in SimGear that constructs SGPath +instances from Nasal scalars to use SGPath::NasalIORulesChecker() as a +PermissionChecker. +--- + src/Scripting/NasalSGPath.cxx | 23 ++++------------------- + 1 file changed, 4 insertions(+), 19 deletions(-) + +diff --git a/src/Scripting/NasalSGPath.cxx b/src/Scripting/NasalSGPath.cxx +index 92abbbe873..d5f49d8922 100644 +--- a/src/Scripting/NasalSGPath.cxx ++++ b/src/Scripting/NasalSGPath.cxx +@@ -30,28 +30,12 @@ + typedef std::shared_ptr<SGPath> SGPathRef; + typedef nasal::Ghost<SGPathRef> NasalSGPath; + +-SGPath::Permissions checkIORules(const SGPath& path) +-{ +- SGPath::Permissions perm; +- if (!path.isAbsolute()) { +- // SGPath caches permissions, which breaks for relative paths +- // if the current directory changes +- SG_LOG(SG_NASAL, SG_ALERT, "os.path: file operation on '" << +- path<< "' access denied (relative paths not accepted; use " +- "realpath() to make a path absolute)"); +- } +- +- perm.read = path.isAbsolute() && !SGPath(path).validate(false).isNull(); +- perm.write = path.isAbsolute() && !SGPath(path).validate(true).isNull(); +- +- return perm; +-} +- + // TODO make exposing such function easier... + static naRef validatedPathToNasal( const nasal::CallContext& ctx, + const SGPath& p ) + { +- return ctx.to_nasal( SGPathRef(new SGPath(p.utf8Str(), &checkIORules)) ); ++ return ctx.to_nasal(SGPathRef(new SGPath(p.utf8Str(), ++ &SGPath::NasalIORulesChecker))); + } + + /** +@@ -78,7 +62,8 @@ static void f_path_set(SGPath& p, const nasal::CallContext& ctx) + */ + static naRef f_desktop(const nasal::CallContext& ctx) + { +- return validatedPathToNasal(ctx, SGPath::desktop(SGPath(&checkIORules))); ++ return validatedPathToNasal( ++ ctx, SGPath::desktop(SGPath(&SGPath::NasalIORulesChecker))); + } + + /** +-- +GitLab + diff --git a/games-simulation/flightgear/flightgear-2020.3.19.ebuild b/games-simulation/flightgear/flightgear-2020.3.19-r1.ebuild index 9d6373a47ddb..a9721bf5e6c4 100644 --- a/games-simulation/flightgear/flightgear-2020.3.19.ebuild +++ b/games-simulation/flightgear/flightgear-2020.3.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,6 +66,7 @@ BDEPEND="qt5? ( >=dev-qt/linguist-tools-5.7.1:5 )" PATCHES=( "${FILESDIR}/${PN}-2020.3.8-cmake.patch" + "${FILESDIR}/${PN}-2020.3.19-CVE-2025-0781.patch" ) DOCS=(AUTHORS ChangeLog NEWS README Thanks) diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index 996071297a2b..4cefb8669b01 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -1,21 +1,18 @@ AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8 AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307f79f923dffffae1b47af55643b64d2776c075ad237530d0a0a074ffd62a18ce021d72fc3c4b4126e2880683c75648908 SHA512 8526095e8716d4885524483e6fe6b6f2ba7edf29bc7bd30602f37aebd5bafdc3a299e5890d3844fc1d573c69244d5415f7d02791e6ac73f9e421f88987bce2dd AUX openrct2-0.4.16-include-additional-paths.patch 685 BLAKE2B 1177b0f68fdc4d5452fc360455a3ab2ae793d6e1839f2f4231345db78d188221edff89dd8dfde15e75220858760f48f676b0d3329a6bbec331283e78a35e6255 SHA512 50a20a3d7d5df323bfcd2d86a3d9cfa517eb53e8028f2f38da7bdc301aecc2492d9aa512dcc69cc82672d1527a240c5783e49b5be6ec1765f6383b41b44e9b48 -AUX openrct2-0.4.16-tileelement.patch 463 BLAKE2B aeeb0940dd75d58597876651d3309cf52e694ba3d89df7b8b047aee9133ff4b1810fad8c136b2fce48932db14f7efef024825bca8c267e8a5c4199d45062365b SHA512 54b12d99e4fa099f3abdbd1f2802618292551a546f6371e1405fbafc05787068ff7d9adc2420e9c3b7f5c318e27cb9db936f54672fef7ff538c2933033b4c2eb AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409 -DIST openrct2-0.4.16.tar.gz 22266650 BLAKE2B 19efa7f08d2f1b82dc3643d6627a1e4758dd679c44d6f49992969b1e75dd5edfe2ab4fce7652dfebcc2e1574a6a404fa2abbf4dc281fb36a26c25ec40024ccc5 SHA512 523ecb6c1358b7d2ee51e862b96fd72215ba5151b888af2878baec099492e097c3d7a99525041e803c5f647eb97c9082751ccf97a468fb7e071d050a9c5fa4c7 -DIST openrct2-0.4.17.tar.gz 22624136 BLAKE2B 6b38ec8fa4f6bdedc047c8e70792b17242b68f92f4a084bf1c3ee93a3990d47750c5867339c497ddb2ee3686be0b2fb92b464373ae2304d719ec35d573e948cc SHA512 b376304693209039845b439a594c5d403f5696854f086a0340c328bdae7e2fb0e54c4cb1af599d59cc128985e9f281b073bea22017b0d5cfcccfecfacfc5ddcd DIST openrct2-0.4.18.tar.gz 22955683 BLAKE2B 5e19ebbf021753e402bb00bf33f79eda254bb2b0c4d22113ab7cdc802cbee2f4a37a5142b238b5eeb0a3d6fce919f60dc0ab2b9c73c628cf273137aa88902878 SHA512 236fa52b9136e6ac329c9c7e4bf415a6c50588e8c30d8973b9da44ab83da3a75177092f8d7492535ea9f82ffa710d8484245c662531d7e3230e2daf69d56c4a2 -DIST openrct2-objects-1.4.10.zip 7495378 BLAKE2B d59f17a419abc935c781075d526ba5e8d6c90d5a524fd314a8c9da3cbd211f87340d615f3a9fe292e2b28cc260734ed344cf2da1e8c76e7310076c2ad163adb0 SHA512 a137a81f6c627ac5d7222c34009d92a24e65bea9b8e0108e59fdf393f1000caee99b9dc9947f824241c055796112d11609b1bcae50ddc33f419723a06b708f64 +DIST openrct2-0.4.19.1.tar.gz 23336008 BLAKE2B b2675bda44d0347cc65a8a507827c56dd92dbcd7fabff85e61529411b721a539ea431d6a4e841bb566f4b9f4d518c1fc4d3ce312f4f910b92acdd41fb97af73a SHA512 3c237fcb89819ce2130eb22371ccb93d559cf89f226f749cfe7f3f187e52af0f083091d9ac8250d3d9d812ee7debfba08e55a72d94f8e0ddca5e2d10765a524e DIST openrct2-objects-1.4.12.zip 7599482 BLAKE2B 896c54e873a7cc143335e8b73dd3115def8fb5205de0028120dee63589db1644b9ba37e390d15cea0cac31014682ac8901e88b519684a03c686b93a702ada579 SHA512 b37984ec5578f4d7f9a43359ade30a621a22474ddbf46614de98e505ed16a62e8621d8c58a6470d66d0e0876db03a4181b259f7fc9468b883422d094c4a8af91 +DIST openrct2-objects-1.5.1.zip 7986278 BLAKE2B e4d87d26682c4edaf6be545df500d2f49a2ddbd793915d4ade79d3a27ac0a3f62d80445435c9662b6e8648f201be80d00f6b48ad04341c0aa08c83ac8814bd1d SHA512 6799943ffa06bb61f670c1b5cd77b03ba6b5c6960e1169b613244cad04b014105a1742034821e33a633b3f2bfbc25f85e1b6d0344a388acdf54bedfd57f82b00 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.83.zip 1829681 BLAKE2B fd3a6ff457d45b0b429b667173c95753bdbf9ecd136a7ce16b516c701d88e436e1796c32d1aa5dc7837dd35ea8db5a89a2c42a99dcd5744b826ab32f98030f98 SHA512 43877cd8452049d4519f0d3fd49d9234195a3d3e38af9a880d43509f0a578e1fef0d428673fea1a9a8307d9917be3e3c4ca9d9e466584b6abd5193a366d5f569 DIST openrct2-replays-0.0.84.zip 1825660 BLAKE2B 7f28f3d5e07e2aa8dc966dafe3fc3ad7e76961c84558d3cdd7fd494ba63dc2f4dfc0a79154d196b9b9139dfa304e745b03546e4087b67538efcf6dc428c69bad SHA512 5ce969de28691a285f2ef2ef0c3b3bc7b094f072be36a89095aa4104bda690c0fe2710db204ce7b95bb891d9a95b8b8d20326236d1386538cfcdb8d36d4c011b +DIST openrct2-replays-0.0.86.zip 1723069 BLAKE2B 5c0ba14718ea6cb79353ae89ad3889f971ec8d369a44a7a8894ae66c44ff72b56888fe346d26a3747c80bfb48835e4444e8e672fb885cdc906a2f7ed826e57f4 SHA512 69db24bf504f895c6b4ff55a4a7eeacf2a02c893b11bccd0495968b1fc3fc1a63b5e9484f6dcf3cc584d98f8e646f5cf66869b863402801e3e297284f1c083e7 DIST openrct2-title-sequences-0.4.14.zip 7791573 BLAKE2B e0bc547b26ba0032c54be0661a1e26bf63a73e3bf0183e3e3d972cbff80e95dd4fa2584852f0da6a597849d822b6d89c3154cbe5ecc99b7eb456560810ed8d17 SHA512 27a1f5e87063ed9baf5faeca15a914e1a57584da6ab0d06d2b9e1f08e801c53f2ea9826381bf5e3dd8e220ff2da601a98841a08f9bcad1e0280b04746512bfb1 -EBUILD openrct2-0.4.16.ebuild 4618 BLAKE2B 4f7adee88c6ac3a35deb6c513f52017e42664f15218deae337f03416167ec3835c8e4bde3b48029ea566efb66c57956bf37d0ec98991ecdc3ec8638db95e51e6 SHA512 ab9e5d2e4d703461f83ce3dcab7e58f353f64f52d87082918c47892dc0037526a7bde4a6c4f339524ec71d3ed4218db6708cb3c256f1afc1e433731c71f8c307 -EBUILD openrct2-0.4.17.ebuild 4621 BLAKE2B 3bf9294239c2a2e363737b7dfb8573567d6d1d9492fbd568acf419e068909ed6c115310e2365f0e8a6cc159a9acfde3d07bdd19809835721143a14ba08d5a6a3 SHA512 750cf0b4378da72651819d10b4a1541932f0a856d720c35c7427a453833918435f07b68f709c39c04664390190bfa3797f8171f80b5edadd8c550245f027db8b -EBUILD openrct2-0.4.18.ebuild 4576 BLAKE2B fdca4e44a02b8c47c9727adc8a44c3e5f8695c19c3e4b302a9279c663f515d7cd697b8804538b3d27815391f58459a184383a917737db945fcf4339e41728208 SHA512 3159da36501d42ebef1b0b18595062c6f87aa9416ab998257bba01d8b2ee0ec440987b43ea1dc5959905a18d6912e7fb364676b5d9a779b2bf4f09b168ae05b7 -EBUILD openrct2-9999.ebuild 4499 BLAKE2B a2335204c11a6b09f3fd951af14964d70a2148e32f856641917b24d588c36f9b213a19dbf826457171f4dd068aca3fb60a7e9d3aa37dd8b6c7aa40fddf30c865 SHA512 43a5ac6592a981d1bd58cf20fcd15f83c2422dc4bb32a2c95227462551492df6a8e52ca464a66dcc027aaea86b735c53c9069d9f29348f28f42202207ef03b0c +EBUILD openrct2-0.4.18.ebuild 4572 BLAKE2B 09618b4ef6ff1c29e0288ac345250d156a491f2197368f17aef8132b1d65e4dba78fee1948ba9777d2d3a5e5579db5905eea0e0fabb345d13699c1a2d607549e SHA512 f3491e78ccb58eef36148aa29f104dc5d917c0edca2ac4811fd1bf5a3cafa9a6671b037403f28f0110d00ff003e96d30cf3d0256c3e1c47b440073bf699aa3d1 +EBUILD openrct2-0.4.19.1.ebuild 4575 BLAKE2B f9786425cd2d72708669d862f67dfb17117e9c911b0d99129c7499e807c289e8613944478f20ebbe608dc4db48534f9b65cfc01a38c878ad1612e2070856afbb SHA512 ff9237fba8c853dd899fc23fcb871a01d3d58ceaf55fd3afa54ea82c2da966328a0043ccad7afc7a576c970af191e5b5ae27a77cc686833a3ae95d9e30ab5980 +EBUILD openrct2-9999.ebuild 4498 BLAKE2B b2749d916e12e98dcc5c1c58c50d4ecb744425ae7db61456cd574933e814aa25a9b40a0740ae63cf70050d736bcd26d59e59d4c1c21540aa4379b73180bb071c SHA512 6edff561e6f632a7fb93eb44c64c936399962f32f3203eb2a2726a17dd9a472989e9ccf39ff2c4d6aaf8e3f41035017bcd5d7412217fa5e87f04f952b4ec0c48 MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e diff --git a/games-simulation/openrct2/files/openrct2-0.4.16-tileelement.patch b/games-simulation/openrct2/files/openrct2-0.4.16-tileelement.patch deleted file mode 100644 index 431a0660524d..000000000000 --- a/games-simulation/openrct2/files/openrct2-0.4.16-tileelement.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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.17.ebuild b/games-simulation/openrct2/openrct2-0.4.17.ebuild deleted file mode 100644 index 936003861248..000000000000 --- a/games-simulation/openrct2/openrct2-0.4.17.ebuild +++ /dev/null @@ -1,181 +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.6" -MY_PV_OBJ="1.4.10" -MY_PV_RPL="0.0.84" -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" - "${FILESDIR}/${PN}-0.4.16-tileelement.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.18.ebuild b/games-simulation/openrct2/openrct2-0.4.18.ebuild index ec8cfa5ba64b..d5a8210817ad 100644 --- a/games-simulation/openrct2/openrct2-0.4.18.ebuild +++ b/games-simulation/openrct2/openrct2-0.4.18.ebuild @@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" IUSE="dedicated +flac +opengl scripting test +truetype +vorbis" RESTRICT="!test? ( test )" diff --git a/games-simulation/openrct2/openrct2-0.4.16.ebuild b/games-simulation/openrct2/openrct2-0.4.19.1.ebuild index ddfec5874f74..3d2bd1a45203 100644 --- a/games-simulation/openrct2/openrct2-0.4.16.ebuild +++ b/games-simulation/openrct2/openrct2-0.4.19.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,8 +12,8 @@ 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_OBJ="1.5.1" +MY_PV_RPL="0.0.86" MY_PV_SFX="1.0.5" MY_PV_TS="0.4.14" @@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="dedicated +flac +opengl scripting test +truetype +vorbis" RESTRICT="!test? ( test )" @@ -79,7 +79,6 @@ 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() { diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild index 1e3b549e339b..68571f87fbd2 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.12" -MY_PV_RPL="0.0.84" +MY_PV_OBJ="1.5.1" +MY_PV_RPL="0.0.86" MY_PV_SFX="1.0.5" MY_PV_TS="0.4.14" diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index d0b1ff306acb..864ad1ddf5ae 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,11 +1,9 @@ AUX openttd-1.11.2_dont_compress_man.patch 999 BLAKE2B 5a2e9d91cb0f60723ef198723b07793c1909e55e68493733ed3cc0ce66441be0e970b7bd8cd6ade43c0090bcc0b2d68cde6230306a55f857ca9d3c0406ccaf17 SHA512 a7b312995000abf5a4bc4418bb466aead75fc3f8dbd4ed7cc3d2914dc96beb815a4cf422e9ca24e41dbbf545dfef8c8cdeeec68f9390e2f6465d1eb80fcaf358 AUX openttd-13.4-gcc15.patch 1029 BLAKE2B ba02b55a48e114118fe4b03d83223b55d9c638c8eaaeeaa1695201b60466d454708ae80e5087f330c4d87c419d4c93a6f3cc1dded6165731d45bbc4f3efaedf0 SHA512 992c8561e9f820a90ed6c29c5d06777f728ec6b8b8da59b0171f5a9d542f1923baea21ff3079ec06b46abbb6e194ea28b9dba3ee5d044c39dc44540a687a2737 -AUX openttd-13.4-icu-76.1.patch 995 BLAKE2B 4874b12466aef0ae87a857116bb040757e0ee7a2f8acca2bd3444b225e4f88939f5988c4611ac7144e5d4325f51deae56b87fcdec13f861d569f198bc872fc88 SHA512 c5261bd6b6b32c48673b28c14cea2b5be0f6dde77abe61a41d1c1d1c33751201c9fd9b5f17764566a1da9819707e3ca0e4fddf725da7a017a9b929a96b322fb6 AUX openttd-14.1-icu-76.1.patch 1174 BLAKE2B 08c070b929c008726dd094dc72e589ce3640f3360396f06513c11970b564d1efca7c2c7087d2be1ec674c2763ba87b8de93d488bc9c2c89f61c8bfff2be27bb3 SHA512 9514088826368cff33ac622d0b33665072fa83f7566be320ea539097d7fb68f32884d14b4b5e209f7d2c7e86f012cc18f128427fe18922d2831592d47b4162f5 AUX openttd.confd-r1 376 BLAKE2B 9208c9da8c90d74d36204c2c78f14b28fa3bf5ec730e2f56b6ae163b474b2169b003fb4d869810a2404cc0ad2e0e5bf9c78417057a762e965787b955431db629 SHA512 a3ca192781b0bf4a1105f13890bc34b3d68a365637adb2254b7b048fa5a1fde80b95415711010b8144135465c2a9cd1a8822cc3bbd2e0161a728c16acb1d0509 AUX openttd.initd-r3 1052 BLAKE2B b4f57691ef749e8aae4be2fb3cf1826b00fa609afbd1f0d863fb6177fe70e4b6254831ea5c89aa74bac9e2dfddf050656dc43790a412870add8baefeb57d9500 SHA512 5064fb633aea2d2720f189a3a5a9f07541394d7760274465bd9837ec4a04009597b984821424f234941972958754db33bc5cc174b7b075c8915fb2231dd3e6f8 -DIST openttd-13.4-source.tar.xz 7428012 BLAKE2B 0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550 SHA512 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001 DIST openttd-14.1-source.tar.xz 8015032 BLAKE2B d107cd41a04f1a0bcfd41730e57628787443e8fe6d90dd59b0211b115b462a8e57e68a30e4b1c72d5f9db2121650f1c4035303e64f7e2e71fdedb23665f445da SHA512 194135cc01457d9ed069c09d8961ad3de681bc9936533ca81ff23099f394bb9a83ef84a0852e85525e258f6149e14fd41cfc5f8e683c0643515005c42fb77e3b -EBUILD openttd-13.4.ebuild 3978 BLAKE2B 0e5da7ce67f10ab1d8fbb580f25fd321e2fe82d6c5638b7b7b9de640838c4221cedb4425c287ed0cd7d6c0bf94d43ad003583dace6264f95a4583ae3be92f1df SHA512 f46264f23f2be36e9949165935c8ced9981bd3b00b456d014014c9ee2f5aae806460e5d1125124151ad117ac9b0cf678225d248746e326093030210d72c78d56 -EBUILD openttd-14.1.ebuild 3788 BLAKE2B 50d1c1ee1c1094159f36f5b4dd594567c0189445f4667c723c0fabd658c736896706afec412eb697bc8a471d5fb624c442718100cd1dd398328c0248db867dab SHA512 8a203b5718fff3bf97a2c358dfc18aa077927e08fe7aef978eeb7c57551e3faf07e7d013f611aebed4d47936d238a065e595476410759bc73863cd8279a07920 +EBUILD openttd-14.1.ebuild 3898 BLAKE2B 164f0d113f5842ee3559b072f59a544ccf2dbe3909a3a15122131af61337666d55d5a1b694b86b9b9e6cdc9f21113c02d47c6f48bf129e3861c8088bc1ada174 SHA512 2205f31ac72ed46a4480fa4aec7b507996e0a18303bcebd2f4dd9dd3b7701c5623122ed633372e65b4a7a414eb87d21c1fd51b7b59d356a41614782a79aa0037 +EBUILD openttd-9999.ebuild 3819 BLAKE2B f273a640f55a086b720e7fbff7da1b58c615a7db9d634e64ed9224e242b9da23a4019045be48843d25d0c26ba164464be0a6922ab93b295dac13a9868ef5bd5f SHA512 710c67e5bb75cb5247b4dc8c0c8d534f8999762feb1d3918b73eef8562d5d2a781044826961699db48475be4b6fb755966200706f545ccd91dda03c8f2297cd7 MISC metadata.xml 857 BLAKE2B e65bf683a6d5beb3c99ae8d83771e5312e00cf40dbbd2dbf9545d7f7134b5df25d58057f23f5afd101a9f2e13396c57bfda59b427896455205ed6e272574f643 SHA512 fa13b5059202687ded428b6670b6a84f1187e767da4a51ef4fca435e8b0c10f900cc60ba7207d690888e442cbc27b03f8ea142e93138fa1b4da4411c13d1b6bf 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 deleted file mode 100644 index 840942c01a67..000000000000 --- a/games-simulation/openttd/files/openttd-13.4-icu-76.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/openttd-14.1.ebuild b/games-simulation/openttd/openttd-14.1.ebuild index dcc100476de9..8c7c890c78f4 100644 --- a/games-simulation/openttd/openttd-14.1.ebuild +++ b/games-simulation/openttd/openttd-14.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,18 @@ 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" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD" + inherit git-r3 +else + SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz" + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi 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 ) )" diff --git a/games-simulation/openttd/openttd-13.4.ebuild b/games-simulation/openttd/openttd-9999.ebuild index c647f80d4818..938874ec597c 100644 --- a/games-simulation/openttd/openttd-13.4.ebuild +++ b/games-simulation/openttd/openttd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,18 +7,23 @@ 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" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/OpenTTD/OpenTTD" + inherit git-r3 +else + SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz" + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi 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 ) )" -# TODO: On master (after 13.x): -# - icu-layoutex is gone (https://github.com/OpenTTD/OpenTTD/commit/81d4fa69990abbc18bd83d60658b0eedd66b7447) -# - icu-le-hb looks like it might be too (https://github.com/OpenTTD/OpenTTD/issues/6922) RDEPEND=" + net-misc/curl dedicated? ( acct-group/openttd acct-user/openttd @@ -28,9 +33,8 @@ RDEPEND=" allegro? ( media-libs/allegro:5 ) fluidsynth? ( media-sound/fluidsynth ) icu? ( - dev-libs/icu-layoutex:= - dev-libs/icu-le-hb >=dev-libs/icu-58.1:= + media-libs/harfbuzz ) sdl? ( media-libs/libsdl2[sound,video] ) truetype? ( @@ -64,8 +68,6 @@ 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() { @@ -91,6 +93,7 @@ src_configure() { -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) |