From a6575ca68477fadceb81b99153e13d1e28c34c6a Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 3 Nov 2020 22:31:42 +0000 Subject: games-fps/gzdoom: Drop old 4.3.3 and 4.4.2 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: James Le Cuirot --- games-fps/gzdoom/Manifest | 2 - ...-4.2.1-Introduce-the-BUILD_NONFREE-option.patch | 35 --------- .../files/gzdoom-4.2.1-install_soundfonts.patch | 34 --------- ...-STATIC-for-internal-GZDoom-SPIRV-library.patch | 30 -------- ...-4.4.2-Introduce-the-BUILD_NONFREE-option.patch | 35 --------- games-fps/gzdoom/gzdoom-4.3.3.ebuild | 88 ---------------------- games-fps/gzdoom/gzdoom-4.4.2.ebuild | 81 -------------------- games-fps/gzdoom/metadata.xml | 2 - 8 files changed, 307 deletions(-) delete mode 100644 games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch delete mode 100644 games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch delete mode 100644 games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch delete mode 100644 games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch delete mode 100644 games-fps/gzdoom/gzdoom-4.3.3.ebuild delete mode 100644 games-fps/gzdoom/gzdoom-4.4.2.ebuild (limited to 'games-fps') diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index 094ab4d9cf1b..ad998dc6aa7a 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,4 +1,2 @@ -DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1 -DIST gzdoom-4.4.2.tar.gz 12613806 BLAKE2B 7c2f6b490abd8bd23068af7df9ebf111bb09cc7af979d7bf285e744f8cb23c69f360b8cb274ebd354f5885aabeb53c744075696ff8fd5710dd15f07f70b4395b SHA512 cf3fb4588555ef98a1c224ca07e3ab0ee00a39ad6abb4fa7e31ce7ce013f146aa2be6c8303badd7a86b21da2a689cbd1d234c46739f84ee5293745a1189226ba DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060 diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch deleted file mode 100644 index 5a8460e64199..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Sat, 31 Aug 2019 21:23:23 +0900 -Subject: [PATCH] Introduce the BUILD_NONFREE option - -This allow users to disable building nonfree components (brightmaps.pk3 -and game_support.pk3) if they so desire. ---- - CMakeLists.txt | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2019-10-20 15:16:08.000000000 +0100 -+++ b/CMakeLists.txt 2019-10-24 21:27:58.104006569 +0100 -@@ -444,10 +444,15 @@ - add_subdirectory( libraries/wildmidi ) - add_subdirectory( libraries/oplsynth ) - add_subdirectory( libraries/zmusic ) -+ - add_subdirectory( wadsrc ) --add_subdirectory( wadsrc_bm ) - add_subdirectory( wadsrc_lights ) --add_subdirectory( wadsrc_extra ) -+option (BUILD_NONFREE "Build nonfree components" ON) -+if( BUILD_NONFREE ) -+ add_subdirectory( wadsrc_bm ) -+ add_subdirectory( wadsrc_extra ) -+endif() -+ - add_subdirectory( src ) - - if( NOT CMAKE_CROSSCOMPILING ) --- -2.23.0 - diff --git a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch deleted file mode 100644 index 1fe0b99d9a8e..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2d1c7ba17cac3ccd201e77ad01a9dd06ab22cb2e Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Thu, 13 Jun 2019 18:01:08 +0900 -Subject: [PATCH] Install soundfonts and WOPL/WOPN banks - -The INSTALL_SOUNDFONT_PATH cache entry is used to configure the -installation directory. ---- - src/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bb16f39e..4ff15062d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1451,6 +1451,15 @@ add_custom_command(TARGET zdoom POST_BUILD - ${CMAKE_SOURCE_DIR}/fm_banks/gs-by-papiezak-and-sneakernets.wopn $/fm_banks/gs-by-papiezak-and-sneakernets.wopn - ) - -+if( WIN32 ) -+ set( INSTALL_SOUNDFONT_PATH . CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) -+else() -+ set( INSTALL_SOUNDFONT_PATH share/games/doom CACHE STRING "Directory where soundfonts and WOPL/WOPN banks will be placed during install." ) -+endif() -+install(FILES "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_banks" -+ DESTINATION ${INSTALL_SOUNDFONT_PATH} -+ COMPONENT "Soundfont resources") -+ - if( CMAKE_COMPILER_IS_GNUCXX ) - # GCC misoptimizes this file - set_source_files_properties( oplsynth/fmopl.cpp PROPERTIES COMPILE_FLAGS "-fno-tree-dominator-opts -fno-tree-fre" ) --- -2.21.0 - diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch deleted file mode 100644 index 779268ca6d7e..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.4.2-Force-STATIC-for-internal-GZDoom-SPIRV-library.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c904b7521657e55843bae34f1f958d689538b13b Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Wed, 17 Jun 2020 15:17:49 -0400 -Subject: [PATCH] Force STATIC for internal GZDoom SPIRV library - -This makes sure the internal version of this library bundled with the -GZDoom source code is used. This prevents the system from building -GZDoom for dynamic linking with an incompatible external library (see -commit 6fafa297bfe0f82696d898d66e39c50f4f5eef16 and -). ---- - libraries/glslang/spirv/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libraries/glslang/spirv/CMakeLists.txt b/libraries/glslang/spirv/CMakeLists.txt -index 453ac16b5..d39a6e300 100644 ---- a/libraries/glslang/spirv/CMakeLists.txt -+++ b/libraries/glslang/spirv/CMakeLists.txt -@@ -49,7 +49,7 @@ set(SPVREMAP_HEADERS - SPVRemapper.h - doc.h) - --add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) -+add_library(SPIRV STATIC ${LIB_TYPE} ${SOURCES} ${HEADERS}) - set_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(SPIRV PUBLIC --- -2.26.2 - diff --git a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch deleted file mode 100644 index d7ece785e25d..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.4.2-Introduce-the-BUILD_NONFREE-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From decf1df37a22c87da78230941209c110f7763f4b Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Sat, 31 Aug 2019 21:23:23 +0900 -Subject: [PATCH] Introduce the BUILD_NONFREE option - -This allow users to disable building nonfree components (brightmaps.pk3 -and game_support.pk3) if they so desire. ---- - CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4e59452..c2f49b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -393,10 +393,14 @@ add_subdirectory( libraries/lzma ) - add_subdirectory( tools ) - add_subdirectory( libraries/gdtoa ) - add_subdirectory( wadsrc ) --add_subdirectory( wadsrc_bm ) - add_subdirectory( wadsrc_lights ) --add_subdirectory( wadsrc_extra ) - add_subdirectory( src ) -+option (BUILD_NONFREE "Build nonfree components" ON) -+if( BUILD_NONFREE ) -+ add_subdirectory( wadsrc_bm ) -+ add_subdirectory( wadsrc_extra ) -+endif() -+ - - if( NOT CMAKE_CROSSCOMPILING ) - export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" ) --- -2.26.2 - diff --git a/games-fps/gzdoom/gzdoom-4.3.3.ebuild b/games-fps/gzdoom/gzdoom-4.3.3.ebuild deleted file mode 100644 index 1ba984d753b4..000000000000 --- a/games-fps/gzdoom/gzdoom-4.3.3.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg - -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="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT - non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile" - -DEPEND=" - media-libs/libsdl2[opengl] - media-libs/openal - sys-libs/zlib - virtual/jpeg:0 - alsa? ( media-libs/alsa-lib ) - fluidsynth? ( media-sound/fluidsynth:= ) - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - ) - mpg123? ( media-sound/mpg123 ) - sndfile? ( media-libs/libsndfile )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-g${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch" - "${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch" -) - -src_prepare() { - rm -rf docs/licenses || die - if ! use non-free ; then - rm -rf wadsrc_bm wadsrc_extra || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}" - -DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom" - -DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom" - -DDYN_FLUIDSYNTH=OFF - -DDYN_OPENAL=OFF - -DDYN_SNDFILE=OFF - -DDYN_MPG123=OFF - -DNO_GTK="$(usex !gtk)" - -DNO_OPENAL=OFF - -DNO_OPENMP="$(usex !openmp)" - -DBUILD_NONFREE="$(usex non-free)" - -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" - -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" - -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" - -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" - ) - 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 -} diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild b/games-fps/gzdoom/gzdoom-4.4.2.ebuild deleted file mode 100644 index 976f3384a393..000000000000 --- a/games-fps/gzdoom/gzdoom-4.4.2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg - -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 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk gtk2 +non-free openmp" - -DEPEND=" - app-arch/bzip2 - media-libs/libsdl2[opengl] - media-libs/openal - media-libs/zmusic - sys-libs/zlib - virtual/jpeg:0 - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-g${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch" - "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch" - "${FILESDIR}/${P}-Force-STATIC-for-internal-GZDoom-SPIRV-library.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 || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -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 - -DNO_OPENMP="$(usex !openmp)" - -DBUILD_NONFREE="$(usex non-free)" - ) - 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 -} diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml index 73491087ed90..656eb066e47e 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -14,9 +14,7 @@ Gentoo Games Project - Enable support for MIDI via media-sound/fluidsynth Enable support for GTK+2 instead of GTK+3 - Enable support for MPEG audio playback via media-sound/mpg123 Enable non-free components -- cgit v1.2.3-65-gdbad