diff options
Diffstat (limited to 'games-fps/gzdoom')
| -rw-r--r-- | games-fps/gzdoom/Manifest | 9 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch | 28 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch (renamed from games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch) | 0 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch (renamed from games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch) | 0 | ||||
| -rw-r--r-- | games-fps/gzdoom/gzdoom-4.2.1.ebuild (renamed from games-fps/gzdoom/gzdoom-4.2.0.ebuild) | 21 |
5 files changed, 16 insertions, 42 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index 526e49c179a6..cbe1cfdc12da 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1,6 +1,5 @@ -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 +AUX gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch 1045 BLAKE2B 642f7d083c577f71336865396cba1c07a68bdf0766033825168689069a12ce18ad062fa4e631f9ce545b392cee35d05f348b5ee41f853c6b374f16e114235380 SHA512 5cae0b86d045285a86f79ed63d7dfa047412241de724f948e6a0cc98412ef1f9f5c119971dfa38fcd2009a00a5bae57e72c8d25b2aedbd7e8eac284e73a53129 +AUX gzdoom-4.2.1-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd +DIST gzdoom-4.2.1.tar.gz 13660636 BLAKE2B f1399014441d1556cc16e8d89b8c321a0591996fbcf8ad85a99403faef3b4663636b2bc4543982f2fc9ebdba777e88e4685985390d2e798eb01c0cea683305f6 SHA512 37a21bf101442cbe36574666dfb92b28eeee6b4dc982d43a8d5c95255e1f49e2451740b54e100b59120cef67f68f6eb07f687155bbab712854ce7ddc7c0b6c4a +EBUILD gzdoom-4.2.1.ebuild 2011 BLAKE2B 0cafc8def0d1c6016326def8b7c69bee2560a7e886f234b54cfd143b47d24b317aa2b6f1024e5ce48587836d68869424c02cc480030dad1fce9e418b33e33383 SHA512 228ccd6946232e33b2e70ac01c89eea76d67d3d685672aeae4c9b21cc419488e000f85e93922f7defae72f282790b4b05e903f5ec9f90924888e145e596a0b9f MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30 diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch deleted file mode 100644 index 1ae12a832b4b..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt <jengelh@inai.de> -Date: 2018-10-16 14:29:56.900427855 +0200 - -Make the build work with fluidsynth 2.x. - ---- - src/sound/mididevices/music_fluidsynth_mididevice.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp -=================================================================== ---- gzdoom-3.6.0.orig/src/sound/mididevices/music_fluidsynth_mididevice.cpp -+++ gzdoom-3.6.0/src/sound/mididevices/music_fluidsynth_mididevice.cpp -@@ -78,10 +78,13 @@ extern "C" unsigned __stdcall GetSystemD - #define FLUID_CHORUS_DEFAULT_LEVEL 2.0f - #define FLUID_CHORUS_DEFAULT_SPEED 0.3f - #define FLUID_CHORUS_DEFAULT_DEPTH 8.0f --#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE - - #endif - -+#ifndef FLUID_CHORUS_DEFAULT_TYPE -+#define FLUID_CHORUS_DEFAULT_TYPE FLUID_CHORUS_MOD_SINE -+#endif -+ - // TYPES ------------------------------------------------------------------- - - // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- 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.1-Introduce-the-BUILD_NONFREE-option.patch index c74d08a24a47..c74d08a24a47 100644 --- a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch +++ b/games-fps/gzdoom/files/gzdoom-4.2.1-Introduce-the-BUILD_NONFREE-option.patch diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch index 1fe0b99d9a8e..1fe0b99d9a8e 100644 --- a/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch +++ b/games-fps/gzdoom/files/gzdoom-4.2.1-install_soundfonts.patch diff --git a/games-fps/gzdoom/gzdoom-4.2.0.ebuild b/games-fps/gzdoom/gzdoom-4.2.1.ebuild index 4fbfe9b905b2..baca2173701c 100644 --- a/games-fps/gzdoom/gzdoom-4.2.0.ebuild +++ b/games-fps/gzdoom/gzdoom-4.2.1.ebuild @@ -12,7 +12,7 @@ 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 nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="gtk gtk2 +nonfree openmp" DEPEND=" @@ -31,13 +31,16 @@ RDEPEND="${DEPEND}" 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() { rm -rf docs/licenses || die + if ! use nonfree ; then + rm -rf wadsrc_bm wadsrc_extra || die + fi + cmake-utils_src_prepare } @@ -68,12 +71,12 @@ 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 + ewarn + ewarn "GZDoom installed without nonfree components." + ewarn "Note: The nonfree game_support.pk3 file is needed to play" + ewarn " games natively supported by GZDoom." + ewarn "A list of games natively supported by GZDoom may be found" + ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" + ewarn fi } |