From 1f0e7a72bdd75897993248ccd8bf8480148b7062 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Mon, 6 Jan 2020 13:24:49 -0500 Subject: games-fps/gzdoom: Version bump to 4.3.1 The "nonfree" USE flag is renamed to "non-free". The "alsa", "fluidsynth", "mpg123", and "sndfile" USE flags are added to control support of their respective packages. Closes: https://bugs.gentoo.org/704880 Bug: https://bugs.gentoo.org/676158 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: William Breathitt Gray Closes: https://github.com/gentoo/gentoo/pull/14272 Signed-off-by: James Le Cuirot --- games-fps/gzdoom/Manifest | 2 +- games-fps/gzdoom/gzdoom-4.2.4.ebuild | 83 ---------------------------------- games-fps/gzdoom/gzdoom-4.3.1.ebuild | 88 ++++++++++++++++++++++++++++++++++++ games-fps/gzdoom/metadata.xml | 4 +- 4 files changed, 92 insertions(+), 85 deletions(-) delete mode 100644 games-fps/gzdoom/gzdoom-4.2.4.ebuild create mode 100644 games-fps/gzdoom/gzdoom-4.3.1.ebuild (limited to 'games-fps') diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest index b1ac6d58a844..1fb177efd010 100644 --- a/games-fps/gzdoom/Manifest +++ b/games-fps/gzdoom/Manifest @@ -1 +1 @@ -DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f SHA512 555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a +DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32 SHA512 6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96 diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild b/games-fps/gzdoom/gzdoom-4.2.4.ebuild deleted file mode 100644 index f6844ab0cf13..000000000000 --- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg - -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 - nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="gtk gtk2 +nonfree 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}" - -S="${WORKDIR}/${PN}-g${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch" - "${FILESDIR}/${PN}-4.2.1-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_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_FLUIDSYNTH=OFF - -DDYN_OPENAL=OFF - -DDYN_SNDFILE=OFF - -DDYN_MPG123=OFF - -DNO_GTK="$(usex !gtk)" - -DNO_OPENAL=OFF - -DNO_OPENMP="$(usex !openmp)" - -DBUILD_NONFREE="$(usex nonfree)" - ) - 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 nonfree ; then - 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 is available" - ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD" - ewarn - fi -} diff --git a/games-fps/gzdoom/gzdoom-4.3.1.ebuild b/games-fps/gzdoom/gzdoom-4.3.1.ebuild new file mode 100644 index 000000000000..1ba984d753b4 --- /dev/null +++ b/games-fps/gzdoom/gzdoom-4.3.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg + +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 + non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile" + +DEPEND=" + media-libs/libsdl2[opengl] + media-libs/openal + sys-libs/zlib + virtual/jpeg:0 + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth:= ) + gtk? ( + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 ) + ) + mpg123? ( media-sound/mpg123 ) + sndfile? ( media-libs/libsndfile )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-g${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.1-install_soundfonts.patch" + "${FILESDIR}/${PN}-4.2.1-Introduce-the-BUILD_NONFREE-option.patch" +) + +src_prepare() { + rm -rf docs/licenses || die + if ! use non-free ; then + rm -rf wadsrc_bm wadsrc_extra || 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_FLUIDSYNTH=OFF + -DDYN_OPENAL=OFF + -DDYN_SNDFILE=OFF + -DDYN_MPG123=OFF + -DNO_GTK="$(usex !gtk)" + -DNO_OPENAL=OFF + -DNO_OPENMP="$(usex !openmp)" + -DBUILD_NONFREE="$(usex non-free)" + -DCMAKE_DISABLE_FIND_PACKAGE_ALSA="$(usex !alsa)" + -DCMAKE_DISABLE_FIND_PACKAGE_FluidSynth="$(usex !fluidsynth)" + -DCMAKE_DISABLE_FIND_PACKAGE_MPG123="$(usex !mpg123)" + -DCMAKE_DISABLE_FIND_PACKAGE_SndFile="$(usex !sndfile)" + ) + 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/metadata.xml b/games-fps/gzdoom/metadata.xml index 5b213dc39913..5e66764ba70e 100644 --- a/games-fps/gzdoom/metadata.xml +++ b/games-fps/gzdoom/metadata.xml @@ -17,8 +17,10 @@ Gentoo Games Project + Enable support for MIDI via media-sound/fluidsynth Enable support for GTK+2 instead of GTK+3 - Enable non-free components + Enable support for MPEG audio playback via media-sound/mpg123 + Enable non-free components https://forum.zdoom.org/viewforum.php?f=2 -- cgit v1.2.3-65-gdbad