From 907b35da57f2d3739b36fcaddcb141010239fe83 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Sun, 12 May 2019 12:23:09 +0900 Subject: [PATCH 1/4] games-fps/gzdoom: timidity and wildmidi are internal Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: William Breathitt Gray --- games-fps/gzdoom/gzdoom-4.1.1.ebuild | 8 ++------ games-fps/gzdoom/metadata.xml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild b/games-fps/gzdoom/gzdoom-4.1.1.ebuild index 2ebc1c2b18..fc2c4bec2c 100644 --- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild +++ b/games-fps/gzdoom/gzdoom-4.1.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.2 GPL-3 LGPL-3 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gtk openal openmp midi" +IUSE="fluidsynth gtk openal openmp" DEPEND=" app-arch/bzip2 @@ -21,7 +21,6 @@ DEPEND=" sys-libs/zlib virtual/jpeg:0 gtk? ( x11-libs/gtk+:* ) - midi? ( media-sound/wildmidi ) openal? ( media-libs/libsndfile media-libs/openal @@ -29,10 +28,7 @@ DEPEND=" )" RDEPEND=" ${DEPEND} - midi? ( - media-sound/fluidsynth - media-sound/timidity++ - )" + fluidsynth? ( media-sound/fluidsynth )" S="${WORKDIR}/${PN}-g${PV}" diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml index 6a4872a591..53026d96e4 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -9,7 +9,7 @@ William Breathitt Gray - Enables MIDI support + Use media-sound/fluidsynth for MIDI support https://forum.zdoom.org/viewforum.php?f=2 From 8228a66ceb61a750e4e57850fe1002af67df6de8 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Sun, 12 May 2019 12:38:46 +0900 Subject: [PATCH 2/4] games-fps/gzdoom: Add phonehome USE flag Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: William Breathitt Gray --- games-fps/gzdoom/gzdoom-4.1.1.ebuild | 3 ++- games-fps/gzdoom/metadata.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild b/games-fps/gzdoom/gzdoom-4.1.1.ebuild index fc2c4bec2c..c37e38af39 100644 --- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild +++ b/games-fps/gzdoom/gzdoom-4.1.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.2 GPL-3 LGPL-3 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="fluidsynth gtk openal openmp" +IUSE="fluidsynth gtk openal openmp phonehome" DEPEND=" app-arch/bzip2 @@ -42,6 +42,7 @@ src_configure() { -DNO_GTK="$(usex !gtk)" -DNO_OPENAL="$(usex !openal)" -DNO_OPENMP="$(usex !openmp)" + -DSEND_ANON_STATS="$(usex phonehome)" ) cmake-utils_src_configure } diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml index 53026d96e4..4d5eb5bf8d 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -10,6 +10,7 @@ Use media-sound/fluidsynth for MIDI support + Enable sending of anonymous hardware statistics https://forum.zdoom.org/viewforum.php?f=2 From ed9bb3facc97e85b54cfa3100ab093e2df494f18 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Sun, 12 May 2019 13:00:19 +0900 Subject: [PATCH 3/4] games-fps/gzdoom: gtk and openal are runtime dependencies Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: William Breathitt Gray --- games-fps/gzdoom/gzdoom-4.1.1.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild b/games-fps/gzdoom/gzdoom-4.1.1.ebuild index c37e38af39..02d1423e14 100644 --- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild +++ b/games-fps/gzdoom/gzdoom-4.1.1.ebuild @@ -19,16 +19,16 @@ DEPEND=" dev-util/glslang media-libs/libsdl2[opengl] sys-libs/zlib - virtual/jpeg:0 + virtual/jpeg:0" +RDEPEND=" + ${DEPEND} + fluidsynth? ( media-sound/fluidsynth ) gtk? ( x11-libs/gtk+:* ) openal? ( media-libs/libsndfile media-libs/openal media-sound/mpg123 )" -RDEPEND=" - ${DEPEND} - fluidsynth? ( media-sound/fluidsynth )" S="${WORKDIR}/${PN}-g${PV}" From 5ffd10106df16f7bca99339ccc3e6a597a90fe10 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Sun, 12 May 2019 15:18:25 +0900 Subject: [PATCH 4/4] Revert "games-fps/gzdoom: Add phonehome USE flag" This reverts commit 8228a66ceb61a750e4e57850fe1002af67df6de8. The phonehome functionality is not supported in the GZDoom 4.1.1 release. Signed-off-by: William Breathitt Gray --- games-fps/gzdoom/gzdoom-4.1.1.ebuild | 3 +-- games-fps/gzdoom/metadata.xml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/games-fps/gzdoom/gzdoom-4.1.1.ebuild b/games-fps/gzdoom/gzdoom-4.1.1.ebuild index 02d1423e14..81898f665b 100644 --- a/games-fps/gzdoom/gzdoom-4.1.1.ebuild +++ b/games-fps/gzdoom/gzdoom-4.1.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.2 GPL-3 LGPL-3 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="fluidsynth gtk openal openmp phonehome" +IUSE="fluidsynth gtk openal openmp" DEPEND=" app-arch/bzip2 @@ -42,7 +42,6 @@ src_configure() { -DNO_GTK="$(usex !gtk)" -DNO_OPENAL="$(usex !openal)" -DNO_OPENMP="$(usex !openmp)" - -DSEND_ANON_STATS="$(usex phonehome)" ) cmake-utils_src_configure } diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml index 4d5eb5bf8d..53026d96e4 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -10,7 +10,6 @@ Use media-sound/fluidsynth for MIDI support - Enable sending of anonymous hardware statistics https://forum.zdoom.org/viewforum.php?f=2