commit: 4c926af29a084cb3a46265875cb53c98818b1874 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Aug 18 21:32:45 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Aug 18 21:32:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c926af2
games-strategy/dunelegacy: Drop old 0.96.4-r1 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-strategy/dunelegacy/Manifest | 1 - .../dunelegacy/dunelegacy-0.96.4-r1.ebuild | 40 ----------------- .../files/dunelegacy-0.96.4-init-mid.patch | 50 ---------------------- 3 files changed, 91 deletions(-) diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest index 74a92e7a4ca8..fffa8079ff69 100644 --- a/games-strategy/dunelegacy/Manifest +++ b/games-strategy/dunelegacy/Manifest @@ -1,2 +1 @@ -DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0 DIST dunelegacy-0.97.02.zip 3241175 BLAKE2B bd99c0d186e3ea2ee94fa77aa9587990ffae51fad30178669a4686c1bf0793c5949c5f13c360359ba44fb6989c00a2a509d746e071b9dc578d966d346b932a74 SHA512 07dd04b3348ed9dc729eabfb7d1646d4ac30351911ca3024991fad58d6ee48f478068fbab25855d637890d5e549ae687af57231c8bf0af1ef8e815fedfbdfd54 diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.4-r1.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.4-r1.ebuild deleted file mode 100644 index 2796c4aef2fb..000000000000 --- a/games-strategy/dunelegacy/dunelegacy-0.96.4-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop xdg - -DESCRIPTION="Updated clone of Westood Studios' Dune II" -HOMEPAGE="https://dunelegacy.sourceforge.net"; -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2"; -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" - -RDEPEND=" - media-libs/libsdl2[sound,threads(+),video] - media-libs/sdl2-mixer[midi] -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-init-mid.patch -) - -src_prepare() { - default - - # Prepend upstream flags. - sed -i -r 's/^(C.*FLAGS)=[^$]+$/\0" ${\1}"/' configure || die -} - -src_install() { - default - - doicon -s scalable ${PN}.svg - doicon -s 48 ${PN}.png - newicon -s 128 ${PN}-128x128.png ${PN}.png - make_desktop_entry ${PN} "Dune Legacy" -} diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch deleted file mode 100644 index 46966269dcad..000000000000 --- a/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e227fc26ffff199a6a659dbe954ff7b764658d4d Mon Sep 17 00:00:00 2001 -From: Richard Schaller <[email protected]> -Date: Sat, 30 Mar 2019 18:07:28 +0100 -Subject: [PATCH] Support for SDL_mixer 2.0.2 or higher: MIX_INIT_FLUIDSYNTH - was renamed to MIX_INIT_MID - ---- - src/FileClasses/music/DirectoryPlayer.cpp | 4 ++++ - src/FileClasses/music/XMIPlayer.cpp | 6 ++++++ - 2 files changed, 10 insertions(+) - -diff --git a/src/FileClasses/music/DirectoryPlayer.cpp b/src/FileClasses/music/DirectoryPlayer.cpp -index 531d971..05d800c 100644 ---- a/src/FileClasses/music/DirectoryPlayer.cpp -+++ b/src/FileClasses/music/DirectoryPlayer.cpp -@@ -59,7 +59,11 @@ DirectoryPlayer::DirectoryPlayer() : MusicPlayer(settings.audio.playMusic, setti - - music = nullptr; - -+#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2) -+ Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG); -+#else - Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG); -+#endif - } - - DirectoryPlayer::~DirectoryPlayer() { -diff --git a/src/FileClasses/music/XMIPlayer.cpp b/src/FileClasses/music/XMIPlayer.cpp -index a7e5150..0fcfa8f 100644 ---- a/src/FileClasses/music/XMIPlayer.cpp -+++ b/src/FileClasses/music/XMIPlayer.cpp -@@ -30,9 +30,15 @@ - XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) { - music = nullptr; - -+#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2) -+ if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) { -+ SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError()); -+ } -+#else - if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) { - SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError()); - } -+#endif - } - - XMIPlayer::~XMIPlayer() { --- -2.24.1 -
