commit: eb1f47dfcc5a1653cebfbe27bd1338d9b9d0b027 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Mar 6 22:37:25 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Mar 9 22:43:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1f47df
games-fps/gzdoom: Drop old 4.10.0 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-fps/gzdoom/Manifest | 1 - games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch | 14 --- games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch | 106 --------------------- games-fps/gzdoom/gzdoom-4.10.0.ebuild | 91 ------------------ 4 files changed, 212 deletions(-) diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index a0775c9f044a..53223b19f78e 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.12.2.tar.gz 25910359 BLAKE2B 3f456136cfc161d67451d8bf1f359d748d6f30f4461a3bff4ab6b02fd949e4057dcbee79eae9ebc0566e33d2f1f3f42add18417b1932e3bccf8b4d5cae9b9a38 SHA512 1e9f34af0d5bf9f3797e0cfef01f993c0b8a742ba0af53b4b13cbce9ecefa15f22949bdbbba5a09e890a01dc32af81806fcb6fc632e0dc9261494580782a5007 diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch deleted file mode 100644 index d34cb749e7f5..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/907087 - -diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h -index fd44722..7189d0e 100644 ---- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h -+++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h -@@ -20,6 +20,8 @@ - // THE SOFTWARE. - // - -+#include <cstdio> -+ - #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H - #define AMD_VULKAN_MEMORY_ALLOCATOR_H diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch deleted file mode 100644 index 3a3a153b5a6e..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch +++ /dev/null @@ -1,106 +0,0 @@ -From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -Date: Sat, 1 Jul 2023 13:36:48 +0100 -Subject: [PATCH] Ensure local headers are used over system headers to avoid - breakage - -types.h was being picked up from webp rather than locally due to the -`include_directories` call for GTK (and therefore its -I arguments) -coming before the same call for the local sources. webp can be pulled in -via GTK -> gdk-pixbuf -> tiff -> webp. - -This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate -when calling `include_directories`. I have done both for good measure. ---- - src/CMakeLists.txt | 18 ++++++++++-------- - tools/zipdir/CMakeLists.txt | 2 +- - 2 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index cf254ad6a..b4d06f9ce 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -97,7 +97,7 @@ else() - if( NOT DYN_GTK ) - set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} ) - endif() -- include_directories( ${GTK3_INCLUDE_DIRS} ) -+ include_directories( SYSTEM ${GTK3_INCLUDE_DIRS} ) - link_directories( ${GTK3_LIBRARY_DIRS} ) - else() - pkg_check_modules( GTK2 gtk+-2.0 ) -@@ -105,7 +105,7 @@ else() - if( NOT DYN_GTK ) - set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} ) - endif() -- include_directories( ${GTK2_INCLUDE_DIRS} ) -+ include_directories( SYSTEM ${GTK2_INCLUDE_DIRS} ) - link_directories( ${GTK2_LIBRARY_DIRS} ) - else() - set( NO_GTK ON ) -@@ -132,7 +132,7 @@ else() - # Non-Windows version also needs SDL except native OS X backend - if( NOT APPLE OR NOT OSX_COCOA_BACKEND ) - find_package( SDL2 REQUIRED ) -- include_directories( "${SDL2_INCLUDE_DIR}" ) -+ include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" ) - set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" ) - endif() - -@@ -143,7 +143,7 @@ if( NOT NO_OPENAL ) - find_package( OpenAL ) - mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR) - if( OPENAL_INCLUDE_DIR ) -- include_directories( ${OPENAL_INCLUDE_DIR} ) -+ include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} ) - mark_as_advanced(CLEAR OPENAL_LIBRARY) - if( OPENAL_LIBRARY ) - set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} ) -@@ -373,17 +373,17 @@ endif() - - if( VPX_FOUND ) - add_definitions( "-DUSE_LIBVPX=1" ) -- include_directories( "${VPX_INCLUDE_DIR}" ) -+ include_directories( SYSTEM "${VPX_INCLUDE_DIR}" ) - set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} ) - else() - message( SEND_ERROR "Could not find libvpx" ) - endif() - --include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") -+include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") - - if( ${HAVE_VM_JIT} ) - add_definitions( -DHAVE_VM_JIT ) -- include_directories( "${ASMJIT_INCLUDE_DIR}" ) -+ include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" ) - set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}") - endif() - -@@ -1243,7 +1243,9 @@ endif() - - target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} ) - --include_directories( . -+include_directories( -+ BEFORE -+ . - common/audio/sound - common/audio/music - common/2d -diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt -index 65eb2fb72..762d9027f 100644 ---- a/tools/zipdir/CMakeLists.txt -+++ b/tools/zipdir/CMakeLists.txt -@@ -1,7 +1,7 @@ - cmake_minimum_required( VERSION 3.1.0 ) - - if( NOT CMAKE_CROSSCOMPILING ) -- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) -+ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) - add_executable( zipdir - zipdir.c ) - target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma ) --- -2.41.0 - diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild deleted file mode 100644 index 0d69df1faeac..000000000000 --- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 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 ~ppc64" -IUSE="debug gles2 gtk +non-free openmp +swr 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}-gcc-13.patch - "${FILESDIR}"/${P}-headers.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)" - -DZDOOM_ENABLE_SWR="$(usex swr)" - -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 -}
