From 95461df035e3867364495f065e5e805bf629b2d7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 26 Oct 2021 00:10:07 +0100 Subject: gentoo resync : 25.10.2021 --- games-fps/Manifest.gz | Bin 10858 -> 10857 bytes games-fps/eduke32/Manifest | 4 +- games-fps/eduke32/eduke32-20210917.9605.ebuild | 219 --------------------- games-fps/eduke32/eduke32-20211010.9722.ebuild | 218 ++++++++++++++++++++ games-fps/gzdoom/Manifest | 5 +- ...-4.7.1-Introduce-the-BUILD_NONFREE-option.patch | 36 ++++ games-fps/gzdoom/gzdoom-4.6.1.ebuild | 83 -------- games-fps/gzdoom/gzdoom-4.7.1.ebuild | 82 ++++++++ 8 files changed, 341 insertions(+), 306 deletions(-) delete mode 100644 games-fps/eduke32/eduke32-20210917.9605.ebuild create mode 100644 games-fps/eduke32/eduke32-20211010.9722.ebuild create mode 100644 games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch delete mode 100644 games-fps/gzdoom/gzdoom-4.6.1.ebuild create mode 100644 games-fps/gzdoom/gzdoom-4.7.1.ebuild (limited to 'games-fps') diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz index 247b77ce1892..a8d240a8c4be 100644 Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index edeb41b2d4db..c500f1638466 100644 --- a/games-fps/eduke32/Manifest +++ b/games-fps/eduke32/Manifest @@ -10,6 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833 -DIST eduke32_src_20210917-9605-71c5ce090.tar.xz 20110232 BLAKE2B e6cfcda18f6e71a6ef3f1dffcdeebce9b8e261ef0744feb3b3fe5b83caba7b3a355f98b64d051fd174d690c98c36b78edb660765d8ecd147517229f335b60bf8 SHA512 b0a03174f53d3932ad9ca5f5c04413dc434e8234a56a0d9acf9b22afb3d2ddc380b9797928f68dde317d1fffefee6ad80e60f385e70be1f7628ca264f36536df -EBUILD eduke32-20210917.9605.ebuild 5783 BLAKE2B fbbf2177656fbb732647316822ba5c3019e5297778950fcbb73fa4dfc829a07a986d3081a1aae7e5ad997bf027ea36d47404981fab357e9b28f7c9bfdacdab49 SHA512 bb081fc934d3a32010a003527f124327016560b7c70e6509ee56d62813f29a397db1b703297f394fa2f99428ee0f05eeb2d93738ffede315fa60c05d1efaa0f5 +DIST eduke32_src_20211010-9722-d307f703c.tar.xz 19792456 BLAKE2B 91f42947e0ab2c9e1ff4d3fb7e9018c0549461b92fc421150b7a3d0b110d82c1734d8dfd522b76eee12de059d7040b5c6f6ed771d11a7f7c68532b98bbb2878f SHA512 6c0836e18b38de37ec86db6df3e53c53e3c269960ca512640324a25093f696cd1711b252871784c3c08bcacaccea1b7ce5c98254683cc5bb5be663424ba455b9 +EBUILD eduke32-20211010.9722.ebuild 5782 BLAKE2B afcd134830d41b7aeaa25524d09e246abbe44ce353fafd3908dc5068da1f47ff982f117171ad16d32997fc2fe1b03ce246f5186193c9a1a6832f5a63602d0979 SHA512 f97954b1522dba14d976adf97c8d4bae043ae6f88a5e63d3a8128efe1b3ce8c97f9d36dc7a04c16064f1b7435e92d383b82d1d959455cb57ae56b7bfefb78bae MISC metadata.xml 1696 BLAKE2B 76d8cb27f0b64251519778ed51c1497807772d552eef3972312b8971e606087f4d44e4fda17499fea766233c1b7aa25ccf1467e76cc74bf1aee58d8cd21f158c SHA512 46dbbacbdcc05ef6907431f8d6bf1385af78c2d717653026ae565a26db2d0c8f05f242aaa78f4b14791c16c40862dc2e4d9a02892f650e222ee8fb4222603a8d diff --git a/games-fps/eduke32/eduke32-20210917.9605.ebuild b/games-fps/eduke32/eduke32-20210917.9605.ebuild deleted file mode 100644 index 4349e3c0f31d..000000000000 --- a/games-fps/eduke32/eduke32-20210917.9605.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs xdg-utils - -EGIT_COMMIT="71c5ce090" -MY_BUILD="$(ver_cut 2)" -MY_DATE="$(ver_cut 1)" -MY_PV_HRP="5.4" -MY_PV_OFFENSIVE_XXX="1.33" -MY_PV_OPL="2.01" -MY_PV_PSX="1.11" -MY_PV_SC55="4.02" -MY_PV_VOXELS="1.21" - -DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D" -HOMEPAGE="http://www.eduke32.com/" -SRC_URI=" - http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz - https://www.eduke32.com/images/eduke32_classic.png - hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip ) - offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip ) - opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip ) - psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip ) - sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip ) - voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip ) -" - -LICENSE="BUILDLIC GPL-2 HRP" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp" -REQUIRED_USE=" - hrp? ( duke3d !voxels ) - offensive? ( duke3d ) - opl? ( duke3d !sc-55 ) - psx? ( duke3d ) - sc-55? ( duke3d !opl ) - voxels? ( !hrp ) - vpx? ( opengl ) -" - -# There are no tests, -# instead it tries to build a test game, which does not compile -RESTRICT="bindist test" - -S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}" - -RDEPEND=" - media-libs/flac - media-libs/libogg - media-libs/libsdl2[alsa,joystick,opengl?,sound,video] - media-libs/libvorbis - media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] - sys-libs/zlib - gtk? ( x11-libs/gtk+:2 ) - opengl? ( - virtual/glu - virtual/opengl - ) - png? ( media-libs/libpng:0= ) - vpx? ( media-libs/libvpx:= ) - xmp? ( media-libs/exempi:2= ) -" - -DEPEND=" - ${RDEPEND} - timidity? ( media-sound/timidity++ ) -" - -BDEPEND=" - app-arch/unzip - x86? ( dev-lang/nasm ) -" - -PDEPEND="duke3d? ( games-fps/duke3d-data )" - -PATCHES=( - "${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch" - "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch" - "${FILESDIR}/${PN}-20200505.8904-gcc10.patch" -) - -src_unpack() { - # Extract only the eduke32 archive - unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz - - # Unpack only the documentation - if use hrp; then - unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die - fi - if use offensive; then - unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die - fi - if use opl; then - unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die - mv readme.txt opl_readme.txt || die - fi - if use sc-55; then - unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die - fi - if use voxels; then - unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die - fi -} - -src_compile() { - local myemakeopts=( - ALLOCACHE_AS_MALLOC=0 - AS=$(tc-getAS) - CC=$(tc-getCC) - CXX=$(tc-getCXX) - CLANG=0 - CPLUSPLUS=1 - CUSTOMOPT="" - DEBUGANYWAY=0 - F_JUMP_TABLES="" - FORCEDEBUG=0 - HAVE_FLAC=1 - HAVE_GTK2=$(usex gtk 1 0) - HAVE_XMP=$(usex xmp 1 0) - LINKED_GTK=$(usex gtk 1 0) - LTO=1 - LUNATIC=0 - KRANDDEBUG=0 - MEMMAP=0 - MIXERTYPE=SDL - NETCODE=$(usex server 1 0) - NOASM=0 - OPTLEVEL=0 - OPTOPT="" - PACKAGE_REPOSITORY=1 - POLYMER=$(usex opengl 1 0) - PRETTY_OUTPUT=0 - PROFILER=0 - RELEASE=1 - RENDERTYPE=SDL - SDL_TARGET=2 - SIMPLE_MENU=0 - STRIP="" - TANDALONE=0 - STARTUP_WINDOW=$(usex gtk 1 0) - USE_OPENGL=$(usex opengl 1 0) - USE_LIBVPX=$(usex vpx 1 0) - USE_LIBPNG=$(usex png 1 0) - USE_LUAJIT_2_1=0 - WITHOUT_GTK=$(usex gtk 0 1) - ) - - emake "${myemakeopts[@]}" - - use tools && emake utils "${myemakeopts[@]}" - use voidsw && emake sw "${myemakeopts[@]}" -} - -src_install() { - dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin - use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin - - if use tools; then - local tools=( - arttool - bsuite - cacheinfo - generateicon - givedepth - ivfrate - kextract - kgroup - kmd2tool - makesdlkeytrans - map2stl - md2tool - mkpalette - transpal - unpackssi - wad2art - wad2map - ) - - dobin "${tools[@]}" - fi - - keepdir /usr/share/games/eduke32 - insinto /usr/share/games/eduke32 - - use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip - use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip - use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip - use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip - use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip - use sdk && doins -r package/sdk - use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip - - newicon "${DISTDIR}"/eduke32_classic.png eduke32.png - - make_desktop_entry eduke32-bin EDuke32 eduke32 Game - make_desktop_entry mapster32 Mapster32 eduke32 Game - use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game - - local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt ) - use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt ) - use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt ) - use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt ) - use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt ) - use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt ) - - einstalldocs -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/games-fps/eduke32/eduke32-20211010.9722.ebuild b/games-fps/eduke32/eduke32-20211010.9722.ebuild new file mode 100644 index 000000000000..84f830d60983 --- /dev/null +++ b/games-fps/eduke32/eduke32-20211010.9722.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs xdg-utils + +EGIT_COMMIT="d307f703c" +MY_BUILD="$(ver_cut 2)" +MY_DATE="$(ver_cut 1)" +MY_PV_HRP="5.4" +MY_PV_OFFENSIVE_XXX="1.33" +MY_PV_OPL="2.01" +MY_PV_PSX="1.11" +MY_PV_SC55="4.02" +MY_PV_VOXELS="1.21" + +DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D" +HOMEPAGE="http://www.eduke32.com/" +SRC_URI=" + http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz + https://www.eduke32.com/images/eduke32_classic.png + hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip ) + offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip ) + opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip ) + psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip ) + sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip ) + voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip ) +" +S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}" + +LICENSE="BUILDLIC GPL-2 HRP" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp" +REQUIRED_USE=" + hrp? ( duke3d !voxels ) + offensive? ( duke3d ) + opl? ( duke3d !sc-55 ) + psx? ( duke3d ) + sc-55? ( duke3d !opl ) + voxels? ( !hrp ) + vpx? ( opengl ) +" + +# There are no tests, +# instead it tries to build a test game, which does not compile +RESTRICT="bindist test" + +RDEPEND=" + media-libs/flac + media-libs/libogg + media-libs/libsdl2[alsa,joystick,opengl?,sound,video] + media-libs/libvorbis + media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] + sys-libs/zlib + gtk? ( x11-libs/gtk+:2 ) + opengl? ( + virtual/glu + virtual/opengl + ) + png? ( media-libs/libpng:0= ) + vpx? ( media-libs/libvpx:= ) + xmp? ( media-libs/exempi:2= ) +" + +DEPEND=" + ${RDEPEND} + timidity? ( media-sound/timidity++ ) +" + +BDEPEND=" + app-arch/unzip + x86? ( dev-lang/nasm ) +" + +PDEPEND="duke3d? ( games-fps/duke3d-data )" + +PATCHES=( + "${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch" + "${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch" + "${FILESDIR}/${PN}-20200505.8904-gcc10.patch" +) + +src_unpack() { + # Extract only the eduke32 archive + unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz + + # Unpack only the documentation + if use hrp; then + unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die + fi + if use offensive; then + unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die + fi + if use opl; then + unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die + mv readme.txt opl_readme.txt || die + fi + if use sc-55; then + unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die + fi + if use voxels; then + unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die + fi +} + +src_compile() { + local myemakeopts=( + ALLOCACHE_AS_MALLOC=0 + AS=$(tc-getAS) + CC=$(tc-getCC) + CXX=$(tc-getCXX) + CLANG=0 + CPLUSPLUS=1 + CUSTOMOPT="" + DEBUGANYWAY=0 + F_JUMP_TABLES="" + FORCEDEBUG=0 + HAVE_FLAC=1 + HAVE_GTK2=$(usex gtk 1 0) + HAVE_XMP=$(usex xmp 1 0) + LINKED_GTK=$(usex gtk 1 0) + LTO=1 + LUNATIC=0 + KRANDDEBUG=0 + MEMMAP=0 + MIXERTYPE=SDL + NETCODE=$(usex server 1 0) + NOASM=0 + OPTLEVEL=0 + OPTOPT="" + PACKAGE_REPOSITORY=1 + POLYMER=$(usex opengl 1 0) + PRETTY_OUTPUT=0 + PROFILER=0 + RELEASE=1 + RENDERTYPE=SDL + SDL_TARGET=2 + SIMPLE_MENU=0 + STRIP="" + TANDALONE=0 + STARTUP_WINDOW=$(usex gtk 1 0) + USE_OPENGL=$(usex opengl 1 0) + USE_LIBVPX=$(usex vpx 1 0) + USE_LIBPNG=$(usex png 1 0) + USE_LUAJIT_2_1=0 + WITHOUT_GTK=$(usex gtk 0 1) + ) + + emake "${myemakeopts[@]}" + + use tools && emake utils "${myemakeopts[@]}" + use voidsw && emake sw "${myemakeopts[@]}" +} + +src_install() { + dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin + use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin + + if use tools; then + local tools=( + arttool + bsuite + cacheinfo + generateicon + givedepth + ivfrate + kextract + kgroup + kmd2tool + makesdlkeytrans + map2stl + md2tool + mkpalette + transpal + unpackssi + wad2art + wad2map + ) + + dobin "${tools[@]}" + fi + + keepdir /usr/share/games/eduke32 + insinto /usr/share/games/eduke32 + + use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip + use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip + use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip + use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip + use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip + use sdk && doins -r package/sdk + use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip + + newicon "${DISTDIR}"/eduke32_classic.png eduke32.png + + make_desktop_entry eduke32-bin EDuke32 eduke32 Game + make_desktop_entry mapster32 Mapster32 eduke32 Game + use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game + + local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt ) + use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt ) + use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt ) + use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt ) + use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt ) + use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt ) + + einstalldocs +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index f8f6017203c7..49407c761d20 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,7 +1,8 @@ AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1eaff1b9c5de6d2fdd614fb3f6c21b676b1c56283bc3b376bbf31e29c6eed27112c03d8738564215824583338acbfa84289fe69cb78ab8ee613643b4 SHA512 55fecbdbda330ae0e95a3ac99f8780d37ca386704f115680204da5403ad380eec14559f0522f7d2b55e1340aeebb9ecd1cbc41fe61e519689e7bd2feed5745a1 -DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41 +AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f +DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543 -EBUILD gzdoom-4.6.1.ebuild 2229 BLAKE2B 6f0f0014c4c6736aa39b99ec4b34b1c406beeb0b5ef13f3dec728e4b3958bc257c564f9264b6e7a03f7e61e6572781d88b460a2901aa9faad36682b9d2dbed22 SHA512 c9d266fc0a8026b848f31fdf97ac91646affb075209ac9c83c11b60e4688d7ef4923dc523bfb72972a3ea35eeecafdbc1bc59bff4e423b49734343a224e66258 EBUILD gzdoom-4.7.0.ebuild 2381 BLAKE2B a100216fe53583cbf3313cf845ca2bcffedd22333e48e68cc317000a502ea3cd95984cca3392817781af526e6720ec1deb090fe97678f0ec358d5213d4b01667 SHA512 5636b6c17f47b8a5cd38040278d0bac30711527b0c8413750b6344a1603e8ecccb4aec913e3c7018c0db3175764d781087769ef6a3e87dd8ef95463c6bf40ae9 +EBUILD gzdoom-4.7.1.ebuild 2095 BLAKE2B ce16912a2083f9d86ab60ede55658df4bb26f0c6c858509473ba066e0dd6fc54a12bce8dc6b56b88ea703c1b0658a48b993a45e42cfe8690408a41e66ae5b749 SHA512 bd69a87286bd7e0c0f00d4cf78cfd48a1b959c6c4a06bb9c21b1b095a41fc9de5044bb159038868858a01c02758f681dab979f199707a9a7937fc7bf5e221857 MISC metadata.xml 880 BLAKE2B 9e2c6bea13a2821469d6f6ac4d21c4b2313f42594257a78a574bf893ec70f94bf0c0208e53401e24cdd06aa0bdb2fedb18374d2785abea393688d62ea4427951 SHA512 2bbe5df923e586acb967be69648fc5ccd604254fc2c9eebfc1cee2ca5448fe16b68b639ca21c9225af1ca7e0ca745dfde7b427166c1482145105dcc2f52a1751 diff --git a/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch new file mode 100644 index 000000000000..9e012a25307f --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch @@ -0,0 +1,36 @@ +From d164cfcde29980c23ece15f0be1b09dac5853843 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, +game_support.pk3, and game_widescreen_gfx.pk3) if they so desire. +--- + CMakeLists.txt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9013d8921..77bd703b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -411,11 +411,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( wadsrc_widepix ) + add_subdirectory( src ) ++option (BUILD_NONFREE "Build nonfree components" ON) ++if( BUILD_NONFREE ) ++ add_subdirectory( wadsrc_bm ) ++ add_subdirectory( wadsrc_extra ) ++ add_subdirectory( wadsrc_widepix ) ++endif() + + if( NOT CMAKE_CROSSCOMPILING ) + export(TARGETS ${CROSS_EXPORTS} FILE "${CMAKE_BINARY_DIR}/ImportExecutables.cmake" ) +-- +2.33.1 + diff --git a/games-fps/gzdoom/gzdoom-4.6.1.ebuild b/games-fps/gzdoom/gzdoom-4.6.1.ebuild deleted file mode 100644 index 7d3705e66a45..000000000000 --- a/games-fps/gzdoom/gzdoom-4.6.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg flag-o-matic - -WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad" -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 - non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.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 ~arm ~x86" -IUSE="debug gtk +non-free openmp" - -DEPEND=" - app-arch/bzip2 - media-libs/libsdl2[opengl] - media-libs/openal - media-libs/zmusic - sys-libs/zlib - virtual/jpeg:0 - gtk? ( x11-libs/gtk+:3 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-g${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.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_widescreen || die - else - mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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)" - ) - - use debug || append-cppflags -DNDEBUG - - 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.7.1.ebuild b/games-fps/gzdoom/gzdoom-4.7.1.ebuild new file mode 100644 index 000000000000..d0da35c22a25 --- /dev/null +++ b/games-fps/gzdoom/gzdoom-4.7.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~arm ~x86" +IUSE="debug gles2 gtk +non-free openmp telemetry vulkan" + +DEPEND=" + app-arch/bzip2 + media-libs/libsdl2[gles2?,opengl,vulkan?] + media-libs/openal + media-libs/zmusic + sys-libs/zlib + virtual/jpeg:0 + gtk? ( x11-libs/gtk+:3 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-g${PV}" + +PATCHES=( + "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.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() { + 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 + -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 +} -- cgit v1.2.3