diff options
Diffstat (limited to 'games-fps/gzdoom')
| -rw-r--r-- | games-fps/gzdoom/Manifest | 11 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch | 36 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch (renamed from games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch) | 0 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch (renamed from games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch) | 0 | ||||
| -rw-r--r-- | games-fps/gzdoom/gzdoom-4.2.0.ebuild (renamed from games-fps/gzdoom/gzdoom-4.1.3.ebuild) | 21 | ||||
| -rw-r--r-- | games-fps/gzdoom/metadata.xml | 1 |
6 files changed, 62 insertions, 7 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index e2476e917539..526e49c179a6 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,5 +1,6 @@ -AUX gzdoom-4.1.3-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1 -AUX gzdoom-4.1.3-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd -DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac -EBUILD gzdoom-4.1.3.ebuild 1416 BLAKE2B d60d589c185e3b675a92329231eabe06139b0acc236df0f31a87ef5b49e547e5e7654ffca00ca1e4b7413cdf5bb6ab7cc600fed0f0cc2216e5b99c8b1d8c2505 SHA512 4be692cbc8c360b7c897723f2b7e61fdd14190424bdee602cf195fdf2f8c018159a004a6fb7fdfc8094d0f96752f7e6522559ef99c8c9d1d343b59ee53d7a80c -MISC metadata.xml 883 BLAKE2B 3d019a0bf36020e6588fea81419fdf87d1e6e9571dcaac4a38fde6a4a0e2dc9b0fe9784fb2539e20c22a93bd689e997f8e195ba8ed1bf42a897397f8fe9b36ca SHA512 61d4477fa1c674118bf347b237cdb31ef00b2410cda123fc1fa5178c47528d14fb22d65f99ec1a2b41c021b676628fe70d74640074f91d4c5d76beee01415ca2 +AUX gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch 1045 BLAKE2B 642f7d083c577f71336865396cba1c07a68bdf0766033825168689069a12ce18ad062fa4e631f9ce545b392cee35d05f348b5ee41f853c6b374f16e114235380 SHA512 5cae0b86d045285a86f79ed63d7dfa047412241de724f948e6a0cc98412ef1f9f5c119971dfa38fcd2009a00a5bae57e72c8d25b2aedbd7e8eac284e73a53129 +AUX gzdoom-4.2.0-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1 +AUX gzdoom-4.2.0-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd +DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d +EBUILD gzdoom-4.2.0.ebuild 1968 BLAKE2B daf0b5dc863b64406f8ae41911ea0489f3e437ace6e8ee4d8d645ba50f1dd4ec63faf5313c5bf440953303c2db913693f804fcb196f38fc2cac4c6833aaaf97a SHA512 5cdeecb97701af6413bafa2178a24d29548d1cea3c13d88535cac0041373ecde8c68a0b4557ee4672fdacaefeadbbff7f35c22747e53cddea743f5e4bb4e290d +MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30 diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch new file mode 100644 index 000000000000..c74d08a24a47 --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch @@ -0,0 +1,36 @@ +From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001 +From: William Breathitt Gray <vilhelm.gray@gmail.com> +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 --git a/CMakeLists.txt b/CMakeLists.txt +index 7860358ef..23d317f42 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma ) + add_subdirectory( tools ) + add_subdirectory( libraries/dumb ) + add_subdirectory( libraries/gdtoa ) ++ + 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.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch index 1ae12a832b4b..1ae12a832b4b 100644 --- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch +++ b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch index 1fe0b99d9a8e..1fe0b99d9a8e 100644 --- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch +++ b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.2.0.ebuild index 242bd4e92879..4fbfe9b905b2 100644 --- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild +++ b/games-fps/gzdoom/gzdoom-4.2.0.ebuild @@ -9,10 +9,11 @@ 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" +LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT + nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk gtk2 openmp" +IUSE="gtk gtk2 +nonfree openmp" DEPEND=" media-libs/libsdl2[opengl] @@ -32,6 +33,7 @@ S="${WORKDIR}/${PN}-g${PV}" PATCHES=( "${FILESDIR}/${P}-fluidsynth2.patch" "${FILESDIR}/${P}-install_soundfonts.patch" + "${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch" ) src_prepare() { @@ -51,6 +53,7 @@ src_configure() { -DNO_GTK="$(usex !gtk)" -DNO_OPENAL=OFF -DNO_OPENMP="$(usex !openmp)" + -DBUILD_NONFREE="$(usex nonfree)" ) cmake-utils_src_configure } @@ -60,3 +63,17 @@ src_install() { make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" cmake-utils_src_install } + +pkg_postinst() { + xdg_pkg_postinst + + if ! use nonfree ; then + elog + elog "GZDoom installed without nonfree components." + elog "Note: The nonfree game_support.pk3 file is needed to play" + elog " games natively supported by GZDoom." + elog "A list of games natively supported by GZDoom may be found" + elog "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" + elog + fi +} diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml index cfd1b5ffe560..5b213dc39913 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -18,6 +18,7 @@ </maintainer> <use> <flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag> + <flag name="nonfree">Enable non-free components</flag> </use> <upstream> <bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to> |