commit: eb83ac8aa89c1de6077507b0cca3b7b19a3fd1f8 Author: Brett A C Sheffield <bacs <AT> librecast <DOT> net> AuthorDate: Wed Mar 11 16:21:58 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 11 16:35:07 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb83ac8a
games-simulation/openttd: drop 14.1, 15.0 Bug: https://bugs.gentoo.org/969225 Signed-off-by: Brett A C Sheffield <bacs <AT> librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/296 Signed-off-by: Sam James <sam <AT> gentoo.org> games-simulation/openttd/Manifest | 2 - .../openttd/files/openttd-13.4-gcc15.patch | 22 ---- .../openttd/files/openttd-14.1-icu-76.1.patch | 34 ----- games-simulation/openttd/openttd-14.1.ebuild | 141 --------------------- games-simulation/openttd/openttd-15.0.ebuild | 137 -------------------- 5 files changed, 336 deletions(-) diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index 34f52363615d..e4def787aa5e 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,3 +1 @@ -DIST openttd-14.1-source.tar.xz 8015032 BLAKE2B d107cd41a04f1a0bcfd41730e57628787443e8fe6d90dd59b0211b115b462a8e57e68a30e4b1c72d5f9db2121650f1c4035303e64f7e2e71fdedb23665f445da SHA512 194135cc01457d9ed069c09d8961ad3de681bc9936533ca81ff23099f394bb9a83ef84a0852e85525e258f6149e14fd41cfc5f8e683c0643515005c42fb77e3b -DIST openttd-15.0-source.tar.xz 8540368 BLAKE2B 4f3210e573e622298c3238e2701e0953826eeb91abce232da4acdd47094508cc30f988899ba204a58c30210fbdd9d37e849ba27bfcc4b7a1dfa10d8647279224 SHA512 ca213546e78fbfadcdc92911d7166e5f255325cb8e54dfe91da81a3325838d8c1be00d51ad172f5b6a5a5e3e8e8440255641b1b5e4f53e12f24e733c18382fa3 DIST openttd-15.1-source.tar.xz 8549560 BLAKE2B 39f1ba1d8c790ccb9784a40e902aa1c7eaf8198f57b2dadf0122bc11dba235c5451a9877b8852094f226dafec9657767ee2bbf736922f48edc98b695534dd1cb SHA512 c6b16bb390e5cdd3b15d9097561c514bb4dce2c592ee3270d36bd1125b15a59274434269a6404c90806b9a825c539fb650b72c4afeb86ba898153b1ec065b2e9 diff --git a/games-simulation/openttd/files/openttd-13.4-gcc15.patch b/games-simulation/openttd/files/openttd-13.4-gcc15.patch deleted file mode 100644 index f849d82c1ed0..000000000000 --- a/games-simulation/openttd/files/openttd-13.4-gcc15.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/OpenTTD/OpenTTD/pull/12876 -https://github.com/OpenTTD/OpenTTD/commit/db36e61807955c896267d6585de0577efd30465d - -From 866cd4381189658641a69bdeca86ceec15aa027d Mon Sep 17 00:00:00 2001 -From: David Seifert <[email protected]> -Date: Mon, 22 Jul 2024 09:27:01 +0200 -Subject: [PATCH] Codechange: fix for GCC 15 two-phase lookup - -* GCC 15 is more aggressive about checking dependent names - -Bug: https://bugs.gentoo.org/936417 ---- a/src/pathfinder/yapf/yapf_road.cpp -+++ b/src/pathfinder/yapf/yapf_road.cpp -@@ -470,7 +470,7 @@ class CYapfFollowRoadT - /* set origin (tile, trackdir) */ - TileIndex src_tile = v->tile; - Trackdir src_td = v->GetVehicleTrackdir(); -- if (!HasTrackdir(GetTrackdirBitsForRoad(src_tile, this->IsTram() ? RTT_TRAM : RTT_ROAD), src_td)) { -+ if (!HasTrackdir(GetTrackdirBitsForRoad(src_tile, Yapf().IsTram() ? RTT_TRAM : RTT_ROAD), src_td)) { - /* sometimes the roadveh is not on the road (it resides on non-existing track) - * how should we handle that situation? */ - return false; 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 deleted file mode 100644 index 3508e8dc9908..000000000000 --- a/games-simulation/openttd/files/openttd-14.1-icu-76.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/OpenTTD/OpenTTD/commit/14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e - -From 14fac2ad37bfb9cec56b4f9169d864f6f1c7b96e Mon Sep 17 00:00:00 2001 -From: fundawang <[email protected]> -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-14.1.ebuild b/games-simulation/openttd/openttd-14.1.ebuild deleted file mode 100644 index 4b82145376c6..000000000000 --- a/games-simulation/openttd/openttd-14.1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2025 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/"; - -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" -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 - virtual/zlib:= - ) - ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo:2 ) - png? ( media-libs/libpng:= ) - zlib? ( virtual/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/openttd/openttd-15.0.ebuild b/games-simulation/openttd/openttd-15.0.ebuild deleted file mode 100644 index 769e22a8c263..000000000000 --- a/games-simulation/openttd/openttd-15.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2026 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/"; - -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" -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? ( - media-libs/libogg - media-libs/opusfile - 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 - virtual/zlib:= - ) - ) - lzma? ( app-arch/xz-utils ) - lzo? ( dev-libs/lzo:2 ) - png? ( media-libs/libpng:= ) - zlib? ( virtual/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" -) - -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) - -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 -}
