commit: b86bff22fa2c93a74b6c39c47326760a1780e01a Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Jun 19 20:53:31 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Jun 19 20:59:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86bff22
games-fps/gzdoom: Drop old 4.8.2-r1 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-fps/gzdoom/Manifest | 1 - .../gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch | 36 --------- games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild | 89 ---------------------- 3 files changed, 126 deletions(-) diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index 66a88cc2bfa1..eeb05548f0af 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,2 +1 @@ DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6 -DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42 diff --git a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch b/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch deleted file mode 100644 index 6070d47566e0..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b132d2c3fe7f9074e1c08dbab77fc1270e8736fb Mon Sep 17 00:00:00 2001 -From: Omar Polo <[email protected]> -Date: Mon, 11 Jul 2022 11:52:43 +0200 -Subject: [PATCH] fix gzdoom.pk3 not found error - -Move the initialization before BaseFileSearch is called, otherwise -GameConfig is used not initialized and it doesn't find the gzdoom.pk3 -file. - -GameConfig used uninitalized was spotted by @LoneFox78. ---- - src/d_main.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/d_main.cpp b/src/d_main.cpp -index b64142c07fe..005f8cf8cd5 100644 ---- a/src/d_main.cpp -+++ b/src/d_main.cpp -@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void) - - std::set_new_handler(NewFailure); - const char *batchout = Args->CheckValue("-errorlog"); -+ -+ D_DoomInit(); - - // [RH] Make sure zdoom.pk3 is always loaded, - // as it contains magic stuff we need. -@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void) - - if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString()); - -- D_DoomInit(); -- - extern void D_ConfirmSendStats(); - D_ConfirmSendStats(); - diff --git a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild deleted file mode 100644 index e8ae3900cb9f..000000000000 --- a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop xdg flag-o-matic - -DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" -HOMEPAGE="https://zdoom.org"; -SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT - non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="debug gles2 gtk +non-free openmp telemetry vulkan" - -DEPEND=" - app-arch/bzip2 - media-libs/libjpeg-turbo:0= - media-libs/libsdl2[gles2?,opengl,vulkan?] - media-libs/libvpx:= - media-libs/openal - media-libs/zmusic - sys-libs/zlib - gtk? ( x11-libs/gtk+:3 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-g${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch - "${FILESDIR}"/${P}-fix-gzdoom-pk3.patch -) - -src_prepare() { - rm -rf docs/licenses || die - rm -rf libraries/{bzip2,jpeg,zlib} || die - if ! use non-free ; then - rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die - fi - - cmake_src_prepare -} - -src_configure() { - # https://bugs.gentoo.org/858749 - filter-lto - append-flags -fno-strict-aliasing - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" - -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" - -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" - -DDYN_OPENAL=OFF - -DNO_GTK="$(usex !gtk)" - -DNO_OPENAL=OFF - -DHAVE_VULKAN="$(usex vulkan)" - -DHAVE_GLES2="$(usex gles2)" - -DNO_OPENMP="$(usex !openmp)" - -DBUILD_NONFREE="$(usex non-free)" - ) - - use debug || append-cppflags -DNDEBUG - use telemetry || append-cppflags -DNO_SEND_STATS - - cmake_src_configure -} - -src_install() { - newicon src/posix/zdoom.xpm "${PN}.xpm" - make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" - cmake_src_install -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use non-free ; then - ewarn - ewarn "GZDoom installed without non-free components." - ewarn "Note: The non-free game_support.pk3 file is needed to play" - ewarn " games natively supported by GZDoom." - ewarn "A list of games natively supported by GZDoom is available" - ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"; - ewarn - fi -}
