summaryrefslogtreecommitdiff
path: root/games-fps/gzdoom
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-22 11:30:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-22 11:30:24 +0100
commitd56d144655e3785864da43c9acb6c228ef9360ae (patch)
treeb769b599a558483f82e9a057c41f1edd29626dd1 /games-fps/gzdoom
parentfab849d1daed0ba7f2ac497d07985c3dbb692543 (diff)
gentoo resync : 22.06.2019
Diffstat (limited to 'games-fps/gzdoom')
-rw-r--r--games-fps/gzdoom/Manifest5
-rw-r--r--games-fps/gzdoom/gzdoom-4.1.3.ebuild23
-rw-r--r--games-fps/gzdoom/metadata.xml1
3 files changed, 15 insertions, 14 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 05b65d34ce7c..e2476e917539 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,5 @@
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 1379 BLAKE2B 34f6cdbe54a9d31eb7d47654f65abfce87b11ee505e28b3b986c4b0367d0be02ba25b5dc20df7b995d8c77c35d636429244713aee13c962d0272827d5135b755 SHA512 d4c325772bba09afd1674a7222a1a0dd9f768e2a1c501f4bf07ee4d62726fa1bc36abbfb70dd4fbe63df67d5fcfe914d7dafe8001aa286f53bdb99118f4a0da2
-MISC metadata.xml 971 BLAKE2B c8b8d21ceb52ed04b079e9fb5de2b30351e5bc613a20d73f8cd26be75615959ace1ac8bf4b61b6009455e5db68377fa093040e7dbd9c2591455a1813c7d2c7b6 SHA512 f8c7cb9aec78c3a6ac5a861a5a7bd9d96dfc18883aa1c9265608edb955f962a81e078b2bcd23524a649643165150fba2e3b04df92d56bba17ec9d5b10156b119
+EBUILD gzdoom-4.1.3.ebuild 1416 BLAKE2B d60d589c185e3b675a92329231eabe06139b0acc236df0f31a87ef5b49e547e5e7654ffca00ca1e4b7413cdf5bb6ab7cc600fed0f0cc2216e5b99c8b1d8c2505 SHA512 4be692cbc8c360b7c897723f2b7e61fdd14190424bdee602cf195fdf2f8c018159a004a6fb7fdfc8094d0f96752f7e6522559ef99c8c9d1d343b59ee53d7a80c
+MISC metadata.xml 883 BLAKE2B 3d019a0bf36020e6588fea81419fdf87d1e6e9571dcaac4a38fde6a4a0e2dc9b0fe9784fb2539e20c22a93bd689e997f8e195ba8ed1bf42a897397f8fe9b36ca SHA512 61d4477fa1c674118bf347b237cdb31ef00b2410cda123fc1fa5178c47528d14fb22d65f99ec1a2b41c021b676628fe70d74640074f91d4c5d76beee01415ca2
diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index d3d5f880537b..242bd4e92879 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -12,27 +12,27 @@ 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"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk gtk2 +openal openmp"
+IUSE="gtk gtk2 openmp"
DEPEND="
media-libs/libsdl2[opengl]
+ media-libs/libsndfile
+ media-libs/openal
+ media-sound/fluidsynth:=
+ media-sound/mpg123
sys-libs/zlib
virtual/jpeg:0
gtk? (
gtk2? ( x11-libs/gtk+:2 )
!gtk2? ( x11-libs/gtk+:3 )
)"
-RDEPEND="
- ${DEPEND}
- fluidsynth? ( media-sound/fluidsynth:= )
- openal? (
- media-libs/libsndfile
- media-libs/openal
- media-sound/mpg123
- )"
+RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-g${PV}"
-PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
+PATCHES=(
+ "${FILESDIR}/${P}-fluidsynth2.patch"
+ "${FILESDIR}/${P}-install_soundfonts.patch"
+)
src_prepare() {
rm -rf docs/licenses || die
@@ -43,12 +43,13 @@ 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="$(usex !openal)"
+ -DNO_OPENAL=OFF
-DNO_OPENMP="$(usex !openmp)"
)
cmake-utils_src_configure
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 95f6ed619edf..cfd1b5ffe560 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,7 +17,6 @@
<name>Gentoo Games Project</name>
</maintainer>
<use>
- <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
</use>
<upstream>