public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2019-06-10 19:51 Andreas Sturmlechner
  0 siblings, 0 replies; 26+ messages in thread
From: Andreas Sturmlechner @ 2019-06-10 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f165f854c3b61f2bd719a384cd1887a117824ace
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 19:45:30 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 19:50:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f165f854

games-fps/gzdoom: Add missing media-sound/fluidsynth slot op

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index 8a614dd5cde..d3d5f880537 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	)"
 RDEPEND="
 	${DEPEND}
-	fluidsynth? ( media-sound/fluidsynth )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	openal? (
 		media-libs/libsndfile
 		media-libs/openal


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2019-06-18 20:59 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2019-06-18 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     22b70de1892785b9f2dc5d3bb2ddab234410cc92
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Wed Jun 12 23:13:06 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 20:55:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b70de1

games-fps/gzdoom: Always build with fluidsynth and openal support

FluidSynth is a dependency of GZDoom and cannot be disabled. Similarly,
OpenAL is a dependency of GZDoom on Linux and cannot be disabled.

Closes: https://bugs.gentoo.org/687922
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12248
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.1.3.ebuild | 17 +++++++----------
 games-fps/gzdoom/metadata.xml        |  1 -
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index d3d5f880537..48957b791ac 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -12,24 +12,21 @@ 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"
@@ -48,7 +45,7 @@ src_configure() {
 		-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 95f6ed619ed..cfd1b5ffe56 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>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2019-09-15  9:13 Mikle Kolyada
  0 siblings, 0 replies; 26+ messages in thread
From: Mikle Kolyada @ 2019-09-15  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b2fbb00a985976b87c86f3a08cfd8e9002afa14a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 09:12:50 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 09:12:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2fbb00a

games-fps/gzdoom: Add ~arm keyword wrt bug #693870

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.2.0.ebuild b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
index 4fbfe9b905b..578941b1a1d 100644
--- a/games-fps/gzdoom/gzdoom-4.2.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.0.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="


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2019-11-07 21:28 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2019-11-07 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     01720b4e5e9176247590947ece391c1ee80e315f
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sun Nov  3 23:53:15 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 21:23:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01720b4e

games-fps/gzdoom: Version bump to 4.2.4

Closes: https://bugs.gentoo.org/699264
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13539
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 +
 games-fps/gzdoom/gzdoom-4.2.4.ebuild | 83 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 41800813492..77c9697b179 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a SHA512 d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6
+DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f SHA512 555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a

diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild b/games-fps/gzdoom/gzdoom-4.2.4.ebuild
new file mode 100644
index 00000000000..da843dc71ad
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.2.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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-utils_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-utils_src_configure
+}
+
+src_install() {
+	newicon src/posix/zdoom.xpm "${PN}.xpm"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
+	cmake-utils_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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2019-11-07 21:28 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2019-11-07 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     72472af53164bec4d2df5c2090288986582a6448
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  7 21:23:49 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 21:23:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72472af5

games-fps/gzdoom: Drop old 4.2.3

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 -
 games-fps/gzdoom/gzdoom-4.2.3.ebuild | 83 ------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 77c9697b179..b1ac6d58a84 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.2.3.tar.gz 13682309 BLAKE2B 33bc9b2c3a28b9b692bd2b28ba45dce95274f78eb42b18c17e48b546b5b5f0c19fe09fd9c36fbb27bae4b1235dd8f0bddde0e67e46d07ea3bca776e6768e697a SHA512 d73b643f2ec6dbf7daa5048ba2db0f18968fb054ca9585dd07f18d20707efbe8e41cc3d8b4520d793d9d32ff34e1a6c74b2eaf84d0192d02263b907f5b3bbbc6
 DIST gzdoom-4.2.4.tar.gz 13683768 BLAKE2B cfdecaf6d92720b3a61fe986a63e6230674cafc65d02f5496a073ffe870319eec62c58377204fd8509fce4869b2a970cc4d1ad98db055d063393ce59d04b1d4f SHA512 555e280db3d66a643cf1412ac1bae5f8c607af339a11a61b1039061de60cf6165c41b3de0c3323ac852b0b2f63f787a1c10ba9240da3174a85ec09d61f5b271a

diff --git a/games-fps/gzdoom/gzdoom-4.2.3.ebuild b/games-fps/gzdoom/gzdoom-4.2.3.ebuild
deleted file mode 100644
index e59ca414756..00000000000
--- a/games-fps/gzdoom/gzdoom-4.2.3.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-utils 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-utils_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-utils_src_configure
-}
-
-src_install() {
-	newicon src/posix/zdoom.xpm "${PN}.xpm"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-	cmake-utils_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 may be found"
-		ewarn "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
-		ewarn
-	fi
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2020-01-07 23:15 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2020-01-07 23:15 UTC (permalink / raw
  To: gentoo-commits

commit:     1f0e7a72bdd75897993248ccd8bf8480148b7062
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Mon Jan  6 18:24:49 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan  7 23:05:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0e7a72

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 <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14272
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest                          |  2 +-
 .../{gzdoom-4.2.4.ebuild => gzdoom-4.3.1.ebuild}   | 29 +++++++++++++---------
 games-fps/gzdoom/metadata.xml                      |  4 ++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index b1ac6d58a84..1fb177efd01 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.3.1.ebuild
similarity index 67%
rename from games-fps/gzdoom/gzdoom-4.2.4.ebuild
rename to games-fps/gzdoom/gzdoom-4.3.1.ebuild
index f6844ab0cf1..1ba984d753b 100644
--- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,23 +10,24 @@ 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 )"
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +nonfree openmp"
+IUSE="alsa fluidsynth gtk gtk2 mpg123 +non-free openmp sndfile"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
-	media-libs/libsndfile
 	media-libs/openal
-	media-sound/fluidsynth:=
-	media-sound/mpg123
 	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}"
@@ -38,7 +39,7 @@ PATCHES=(
 
 src_prepare() {
 	rm -rf docs/licenses || die
-	if ! use nonfree ; then
+	if ! use non-free ; then
 		rm -rf wadsrc_bm wadsrc_extra || die
 	fi
 
@@ -57,7 +58,11 @@ src_configure() {
 		-DNO_GTK="$(usex !gtk)"
 		-DNO_OPENAL=OFF
 		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex nonfree)"
+		-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
 }
@@ -71,10 +76,10 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use nonfree ; then
+	if ! use non-free ; then
 		ewarn
-		ewarn "GZDoom installed without nonfree components."
-		ewarn "Note: The nonfree game_support.pk3 file is needed to play"
+		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"

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 5b213dc3991..5e66764ba70 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,8 +17,10 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="fluidsynth">Enable support for MIDI via <pkg>media-sound/fluidsynth</pkg></flag>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
-		<flag name="nonfree">Enable non-free components</flag>
+		<flag name="mpg123">Enable support for MPEG audio playback via <pkg>media-sound/mpg123</pkg></flag>
+		<flag name="non-free">Enable non-free components</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2020-01-25 14:19 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2020-01-25 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     49c7e42863ef52bcc5fed594e7ea4660c4107b1f
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sun Jan 12 23:08:47 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 14:15:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c7e428

games-fps/gzdoom: Version bump to 4.3.3

Closes: https://bugs.gentoo.org/705322
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14324
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 +
 games-fps/gzdoom/gzdoom-4.3.3.ebuild | 88 ++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 1fb177efd01..a4ae231fe4b 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32 SHA512 6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96
+DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1

diff --git a/games-fps/gzdoom/gzdoom-4.3.3.ebuild b/games-fps/gzdoom/gzdoom-4.3.3.ebuild
new file mode 100644
index 00000000000..1ba984d753b
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.3.3.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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2020-01-25 14:19 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2020-01-25 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     d7e2fdca55e75a4b2ddc2f0e9daba8383ba4810e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 14:19:23 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 14:19:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e2fdca

games-fps/gzdoom: Drop old 4.3.1

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 -
 games-fps/gzdoom/gzdoom-4.3.1.ebuild | 88 ------------------------------------
 2 files changed, 89 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index a4ae231fe4b..c7de0cf9fa7 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1 @@
-DIST gzdoom-4.3.1.tar.gz 13689272 BLAKE2B 3bc26732bc2f3281d0e5a1c667226153d411048877d3a716b6e4ce89534a38cde3763e5cf5d409d99bb053e75d5922b20b4b4d93ce574de58420ae89158eab32 SHA512 6904b8a132f720f07ba15bb4959cf248bba753c318e248d882c5701d919d35492a4fb460a4d4716bc26fde8a1c59d4bceaf3f626326a90a06d4f6cde6a180b96
 DIST gzdoom-4.3.3.tar.gz 13704956 BLAKE2B 4c9338b8958a408bee268eadadd779be8488540e68d5f46d7d0b18a825cd6391368b2c5149eff965685dd97f7ee51f12050e07f558c7f62551c8e239049110ea SHA512 ef8e3a7cfa4d03a98536deddb53ded4b23609b834dd07af4224cd2eb1136bca2a318a99a959a36b2e423038938a2175c015c48d89510f124bd32b7656004e1d1

diff --git a/games-fps/gzdoom/gzdoom-4.3.1.ebuild b/games-fps/gzdoom/gzdoom-4.3.1.ebuild
deleted file mode 100644
index 1ba984d753b..00000000000
--- a/games-fps/gzdoom/gzdoom-4.3.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2020-09-05 23:44 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2020-09-05 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     aa2806889f78fa099bb618f4f934e38175f7df6b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 23:42:57 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 23:43:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa280688

games-fps/gzdoom: Keyword 4.4.2 arm, #740422

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.4.2.ebuild b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
index 5c345dd665b..976f3384a39 100644
--- a/games-fps/gzdoom/gzdoom-4.4.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk gtk2 +non-free openmp"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-01-19 23:07 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-01-19 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e4838ac91243db3cc2fc510d7fbab6fe368e6278
Author:     TheGreatMcPain <sixsupersonic <AT> gmail <DOT> com>
AuthorDate: Tue Jan 19 22:38:54 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 23:03:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4838ac9

games-fps/gzdoom: Add '-DNDEBUG' to CXXFLAGS

Allows certain mods, like Project Brutality's git master, to work.

See: https://github.com/coelckers/gzdoom/issues/1279

I've also added a 'debug' useflag that skips 'append-cppflags -DNDEBUG'
just incase.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: James McClain <sixsupersonic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19121
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index bf1ddc570ec..60680a131e1 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop xdg
+inherit cmake desktop xdg flag-o-matic
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk gtk2 +non-free openmp"
+IUSE="debug gtk gtk2 +non-free openmp"
 
 DEPEND="
 	app-arch/bzip2
@@ -58,6 +58,9 @@ src_configure() {
 		-DNO_OPENMP="$(usex !openmp)"
 		-DBUILD_NONFREE="$(usex non-free)"
 	)
+
+	use debug || append-cppflags -DNDEBUG
+
 	cmake_src_configure
 }
 


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-02-08  6:49 Andreas Sturmlechner
  0 siblings, 0 replies; 26+ messages in thread
From: Andreas Sturmlechner @ 2021-02-08  6:49 UTC (permalink / raw
  To: gentoo-commits

commit:     32d6ac6c3ae62c80040f7a4b69029408409b3659
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Mon Feb  8 06:32:33 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 06:49:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d6ac6c

games-fps/gzdoom: Drop optional gtk2 support

Closes: https://bugs.gentoo.org/769071
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19373
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 7 ++-----
 games-fps/gzdoom/metadata.xml        | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index 60680a131e1..a07fb6ae4bc 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk gtk2 +non-free openmp"
+IUSE="debug gtk +non-free openmp"
 
 DEPEND="
 	app-arch/bzip2
@@ -23,10 +23,7 @@ DEPEND="
 	media-libs/zmusic
 	sys-libs/zlib
 	virtual/jpeg:0
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
+	gtk? ( x11-libs/gtk+:3 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 656eb066e47..a805c66b7d1 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
 		<flag name="non-free">Enable non-free components</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-05-22 23:05 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-05-22 23:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ad44c782b5118e1fb1db83163a21ae293002fbc5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 23:04:58 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 22 23:04:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad44c782

games-fps/gzdoom: Version bump to 4.6.0 (including WidePix)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  2 +
 games-fps/gzdoom/gzdoom-4.6.0.ebuild | 83 ++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ad998dc6aa7..ece4cfb4eb8 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,4 @@
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
+DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
+DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.0.ebuild b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
new file mode 100644
index 00000000000..7d3705e66a4
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+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
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gtk +non-free openmp"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[opengl]
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+	else
+		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+
+	use debug || append-cppflags -DNDEBUG
+
+	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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-07-26 22:49 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-07-26 22:49 UTC (permalink / raw
  To: gentoo-commits

commit:     382eb8c6920f100f768332a573f950035f1fb88b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 22:49:01 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 22:49:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382eb8c6

games-fps/gzdoom: Drop old 4.5.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  2 -
 games-fps/gzdoom/gzdoom-4.5.0.ebuild | 82 ------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index fc79096e54d..c3394f88378 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,3 @@
-DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
-DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
deleted file mode 100644
index a07fb6ae4bc..00000000000
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-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
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz -> widepix-9273804.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[opengl]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	rm -rf libraries/{bzip2,jpeg,zlib} || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-	else
-		mv "${WORKDIR}/WidePix-92738042ca3a37f28153a09809d80a7d61090532/filter" wadsrc_widescreen/static/ || 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_OPENAL=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-07-26 22:49 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-07-26 22:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bbd68a90169d297abfea633f88235673a0f3b837
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 22:48:40 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 22:48:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd68a90

games-fps/gzdoom: Version bump to 4.6.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 +
 games-fps/gzdoom/gzdoom-4.6.1.ebuild | 83 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index ece4cfb4eb8..fc79096e54d 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,5 @@
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
+DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.1.ebuild b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
new file mode 100644
index 00000000000..7d3705e66a4
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+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
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gtk +non-free openmp"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[opengl]
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+	else
+		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+
+	use debug || append-cppflags -DNDEBUG
+
+	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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-10-09 22:20 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-10-09 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f7e4330240ab0d0aea5b1617c54c6d8cedd65fc3
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Oct  2 08:54:16 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 22:12:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e43302

games-fps/gzdoom: Version bump to 4.7.0

The gles2, telemetry, and vulkan USE flags are introduced.

Closes: https://bugs.gentoo.org/815274
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 +
 games-fps/gzdoom/gzdoom-4.7.0.ebuild | 86 ++++++++++++++++++++++++++++++++++++
 games-fps/gzdoom/metadata.xml        |  2 +
 3 files changed, 89 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index c3394f88378..bb35095aad0 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1,4 @@
 DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
+DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.7.0.ebuild b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
new file mode 100644
index 00000000000..52da570e32f
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg flag-o-matic
+
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
+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
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
+
+LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libsdl2[gles2?,opengl,vulkan?]
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	virtual/jpeg:0
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
+	else
+		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DHAVE_VULKAN="$(usex vulkan)"
+		-DHAVE_GLES2="$(usex gles2)"
+		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+
+	use debug || append-cppflags -DNDEBUG
+	use telemetry || append-cppflags -DNO_SEND_STATS
+
+	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 ae171bd27d9..5bd8c339a08 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,7 +14,9 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="gles2">Enable GLES2 backend</flag>
 		<flag name="non-free">Enable non-free components</flag>
+		<flag name="vulkan">Enable Vulkan support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-10-09 22:20 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-10-09 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     e246606b23079ee0cdf4190b0c8fd915a1aba7e6
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Oct  2 09:05:37 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Oct  9 22:12:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e246606b

games-fps/gzdoom: Drop old

Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22464
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 -
 games-fps/gzdoom/gzdoom-4.6.0.ebuild | 83 ------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bb35095aad0..830e1f26f61 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,3 @@
-DIST gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
 DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.0.ebuild b/games-fps/gzdoom/gzdoom-4.6.0.ebuild
deleted file mode 100644
index 7d3705e66a4..00000000000
--- a/games-fps/gzdoom/gzdoom-4.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[opengl]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	rm -rf libraries/{bzip2,jpeg,zlib} || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-	else
-		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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_OPENAL=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2021-10-23  7:39 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2021-10-23  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     cfc00948735b4a3e627b1023a8aa2b65743c551a
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Oct 23 01:41:51 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 07:34:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc00948

games-fps/gzdoom: Drop old version 4.6.1

Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22678
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 -
 games-fps/gzdoom/gzdoom-4.6.1.ebuild | 83 ------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 0cb8608c746..75988327535 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,3 @@
-DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST gzdoom-4.7.0.tar.gz 14070204 BLAKE2B 4cf0555e7d1e34f71057502bce0973d49ffca6bccd2396faee6360832511b90450008c4ec22a0cdadfa3edcd13ec73bf412c0af7c6298c560c087f8a3d5f0bdb SHA512 539d1de85b3e2313e57fc8fcb0fa4b7a5110107f5436ee3412342c1140cebbe4ccec45efa3211b43aba8bc3715ce0e7819dd593f55d8ee906f2382573435361f
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543

diff --git a/games-fps/gzdoom/gzdoom-4.6.1.ebuild b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
deleted file mode 100644
index 7d3705e66a4..00000000000
--- a/games-fps/gzdoom/gzdoom-4.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
-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
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
-
-LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk +non-free openmp"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[opengl]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	rm -rf libraries/{bzip2,jpeg,zlib} || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
-	else
-		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || 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_OPENAL=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2022-08-04  7:12 Joonas Niilola
  0 siblings, 0 replies; 26+ messages in thread
From: Joonas Niilola @ 2022-08-04  7:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a19c006e1cf58d10c82fe9a944b490780cbddcc0
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Fri Jul 22 20:36:23 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 07:04:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19c006e

games-fps/gzdoom: Filter LTO and disable strict aliasing

Closes: https://bugs.gentoo.org/858749
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26525
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.8.2.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/games-fps/gzdoom/gzdoom-4.8.2.ebuild b/games-fps/gzdoom/gzdoom-4.8.2.ebuild
index f697ad1bc5eb..ab1b0da8c59c 100644
--- a/games-fps/gzdoom/gzdoom-4.8.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.8.2.ebuild
@@ -44,6 +44,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/858749
+	filter-lto
+	append-flags -fno-strict-aliasing
+
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
 		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2022-09-19  6:42 Michał Górny
  0 siblings, 0 replies; 26+ messages in thread
From: Michał Górny @ 2022-09-19  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d712bd78d4f28fc0e7d13969ef0281481cbc6f03
Author:     matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Sep 19 01:08:59 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 06:42:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d712bd78

games-fps/gzdoom: Keyword 4.8.2-r1 arm64, #849866

Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
index 03a5359074ef..e8ae3900cb9f 100644
--- a/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.8.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2022-12-08 22:03 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2022-12-08 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5b68f6835d7b3e29b9037cd4bf631e2c13bbf1b4
Author:     William Breathitt Gray <william.gray <AT> linaro <DOT> org>
AuthorDate: Fri Dec  2 16:43:19 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 21:59:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b68f683

games-fps/gzdoom: version bump to 4.10.0

The 'swr' USE flag is introduced to configure support for the software
renderer. This is mainly to allow users to disable the software
renderer for new games that have been designed for hardware rendering.

Closes: https://bugs.gentoo.org/884037
Signed-off-by: William Breathitt Gray <william.gray <AT> linaro.org>
Closes: https://github.com/gentoo/gentoo/pull/28511
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest             |  1 +
 games-fps/gzdoom/gzdoom-4.10.0.ebuild | 89 +++++++++++++++++++++++++++++++++++
 games-fps/gzdoom/metadata.xml         |  1 +
 3 files changed, 91 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 3fad5682d972..1d6e0cc12cac 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,2 +1,3 @@
+DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
 DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
new file mode 100644
index 000000000000..a9545cb61896
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg flag-o-matic
+
+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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libjpeg-turbo:0=
+	media-libs/libsdl2[gles2?,opengl,vulkan?]
+	media-libs/libvpx:=
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/858749
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DHAVE_VULKAN="$(usex vulkan)"
+		-DHAVE_GLES2="$(usex gles2)"
+		-DNO_OPENMP="$(usex !openmp)"
+		-DZDOOM_ENABLE_SWR="$(usex swr)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+
+	use debug || append-cppflags -DNDEBUG
+	use telemetry || append-cppflags -DNO_SEND_STATS
+
+	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 5bd8c339a086..79b8864223c7 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -16,6 +16,7 @@
 	<use>
 		<flag name="gles2">Enable GLES2 backend</flag>
 		<flag name="non-free">Enable non-free components</flag>
+		<flag name="swr">Enable software renderer</flag>
 		<flag name="vulkan">Enable Vulkan support</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2022-12-08 22:03 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2022-12-08 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     fde8d7ffb7b7d232992df97de1a4fc804c6ef7e8
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 22:02:45 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 22:02:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde8d7ff

games-fps/gzdoom: Drop old 4.7.1

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest            |  1 -
 games-fps/gzdoom/gzdoom-4.7.1.ebuild | 82 ------------------------------------
 2 files changed, 83 deletions(-)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 1d6e0cc12cac..66a88cc2bfa1 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,3 +1,2 @@
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
-DIST gzdoom-4.7.1.tar.gz 19562412 BLAKE2B 48b089c9d0ca0f26820ea90ea1a1a6ce3fa325f6f7bd36ded66ba43eeaab610ca99eacb1ca0aec75b0888a65108573e2c85d2ce0e88663031583267f1143386e SHA512 040a51d2783616cca9f3d7e70bf83adf0d6afa8d7378a9f743cbf152811c07c4f03eecdbbdb617d9fda625049a6f13313dce6e5017698bf36fae74e107c012f0
 DIST gzdoom-4.8.2.tar.gz 24247668 BLAKE2B b9a505c29d14486bec96f53f614968c67ec0d8db0b784071d171038dec3a88c800483211e4ba59e8408ce5680f4800cbc455b4a53becd53e89bde17c7b7a69a5 SHA512 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42

diff --git a/games-fps/gzdoom/gzdoom-4.7.1.ebuild b/games-fps/gzdoom/gzdoom-4.7.1.ebuild
deleted file mode 100644
index d0da35c22a25..000000000000
--- a/games-fps/gzdoom/gzdoom-4.7.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg flag-o-matic
-
-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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
-	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gles2 gtk +non-free openmp telemetry vulkan"
-
-DEPEND="
-	app-arch/bzip2
-	media-libs/libsdl2[gles2?,opengl,vulkan?]
-	media-libs/openal
-	media-libs/zmusic
-	sys-libs/zlib
-	virtual/jpeg:0
-	gtk? ( x11-libs/gtk+:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-g${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
-)
-
-src_prepare() {
-	rm -rf docs/licenses || die
-	rm -rf libraries/{bzip2,jpeg,zlib} || die
-	if ! use non-free ; then
-		rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || 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_OPENAL=OFF
-		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL=OFF
-		-DHAVE_VULKAN="$(usex vulkan)"
-		-DHAVE_GLES2="$(usex gles2)"
-		-DNO_OPENMP="$(usex !openmp)"
-		-DBUILD_NONFREE="$(usex non-free)"
-	)
-
-	use debug || append-cppflags -DNDEBUG
-	use telemetry || append-cppflags -DNO_SEND_STATS
-
-	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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2023-05-23  2:52 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2023-05-23  2:52 UTC (permalink / raw
  To: gentoo-commits

commit:     f4073e9351bf49fd5d20b662e72f8ed68481f6a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 02:43:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 02:51:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4073e93

games-fps/gzdoom: defer to new global USE=vulkan description

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/gzdoom/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 79b8864223c7..41b3c9962102 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="gles2">Enable GLES2 backend</flag>
 		<flag name="non-free">Enable non-free components</flag>
 		<flag name="swr">Enable software renderer</flag>
-		<flag name="vulkan">Enable Vulkan support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2023-12-19  5:19 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2023-12-19  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     4da609bda8c1fad592be759c8bf30aa37d7b8b8a
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Dec 19 00:45:22 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 05:17:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da609bd

games-fps/gzdoom: Keyword 4.10.0 ppc64, #849866

Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
index 605c7cdcf993..0d69df1faeac 100644
--- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2024-03-02 14:14 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2024-03-02 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     855638848766104463b5fc94c18137d3c1b522c2
Author:     William Breathitt Gray <william.gray <AT> linaro <DOT> org>
AuthorDate: Sat Mar  2 13:42:15 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 14:14:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85563884

games-fps/gzdoom: update maintainers

Signed-off-by: William Breathitt Gray <william.gray <AT> linaro.org>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/metadata.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index b337177bc8a0..dc9f81322c53 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>vilhelm.gray@gmail.com</email>
-		<name>William Breathitt Gray</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2024-05-01 21:40 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2024-05-01 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     464c6025f0303dfa6e7bd4fc4583f8d3f59b544e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 21:39:20 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed May  1 21:39:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464c6025

games-fps/gzdoom: Move S, die for gitinfo.h

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/gzdoom-4.12.2.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/games-fps/gzdoom/gzdoom-4.12.2.ebuild b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
index dcb9477e00de..b308fb3d0b50 100644
--- a/games-fps/gzdoom/gzdoom-4.12.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,6 +8,7 @@ inherit cmake desktop xdg flag-o-matic
 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"
+S="${WORKDIR}/${PN}-g${PV}"
 
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
@@ -27,8 +28,6 @@ DEPEND="
 	gtk? ( x11-libs/gtk+:3 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}-g${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
 )
@@ -48,7 +47,7 @@ src_prepare() {
 		echo "#define GIT_DESCRIPTION \"g${PV}\""
 		echo "#define GIT_HASH \"0\""
 		echo "#define GIT_TIME \"\""
-	} > "${S}/src/gitinfo.h"
+	} > "${S}/src/gitinfo.h" || die
 
 	cmake_src_prepare
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/
@ 2024-05-01 21:40 James Le Cuirot
  0 siblings, 0 replies; 26+ messages in thread
From: James Le Cuirot @ 2024-05-01 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3523c47190db130876b884d353e713e0a801f1d7
Author:     Alexandra Parker <alex.iris.parker <AT> gmail <DOT> com>
AuthorDate: Mon Apr 15 04:51:32 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed May  1 21:32:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3523c471

games-fps/gzdoom: bump to 4.12.2

Deactivates buidl too that reads the program's version from 'git
describe' by generating a src/gitinfo.h from ${PV}.

Bug: https://bugs.gentoo.org/926024
Signed-off-by: Alexandra Parker <alex.iris.parker <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36449
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/gzdoom/Manifest             |   1 +
 games-fps/gzdoom/gzdoom-4.12.2.ebuild | 100 ++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index eeb05548f0af..a0775c9f044a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1 +1,2 @@
 DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
+DIST gzdoom-4.12.2.tar.gz 25910359 BLAKE2B 3f456136cfc161d67451d8bf1f359d748d6f30f4461a3bff4ab6b02fd949e4057dcbee79eae9ebc0566e33d2f1f3f42add18417b1932e3bccf8b4d5cae9b9a38 SHA512 1e9f34af0d5bf9f3797e0cfef01f993c0b8a742ba0af53b4b13cbce9ecefa15f22949bdbbba5a09e890a01dc32af81806fcb6fc632e0dc9261494580782a5007

diff --git a/games-fps/gzdoom/gzdoom-4.12.2.ebuild b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
new file mode 100644
index 000000000000..dcb9477e00de
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-4.12.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg flag-o-matic
+
+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="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
+	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="debug gles2 gtk +non-free openmp +swr telemetry vulkan"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/libjpeg-turbo:0=
+	media-libs/libsdl2[gles2?,opengl,vulkan?]
+	media-libs/libvpx:=
+	media-libs/libwebp
+	media-libs/openal
+	media-libs/zmusic
+	sys-libs/zlib
+	gtk? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-g${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
+)
+
+src_prepare() {
+	rm -rf docs/licenses || die
+	rm -rf libraries/{bzip2,jpeg,zlib} || die
+	if ! use non-free ; then
+		rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
+	fi
+
+	{
+		echo "// 0"
+		echo "// The above line prevents UpdateRevision.cmake from replacing this file."
+		echo "// This file was generated by the Gentoo ebuild."
+		echo
+		echo "#define GIT_DESCRIPTION \"g${PV}\""
+		echo "#define GIT_HASH \"0\""
+		echo "#define GIT_TIME \"\""
+	} > "${S}/src/gitinfo.h"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/858749
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
+		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
+		-DDYN_OPENAL=OFF
+		-DNO_GTK="$(usex !gtk)"
+		-DNO_OPENAL=OFF
+		-DHAVE_VULKAN="$(usex vulkan)"
+		-DHAVE_GLES2="$(usex gles2)"
+		-DNO_OPENMP="$(usex !openmp)"
+		-DZDOOM_ENABLE_SWR="$(usex swr)"
+		-DBUILD_NONFREE="$(usex non-free)"
+	)
+
+	use debug || append-cppflags -DNDEBUG
+	use telemetry || append-cppflags -DNO_SEND_STATS
+
+	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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2024-05-01 21:40 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-18 20:59 [gentoo-commits] repo/gentoo:master commit in: games-fps/gzdoom/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2024-05-01 21:40 James Le Cuirot
2024-05-01 21:40 James Le Cuirot
2024-03-02 14:14 James Le Cuirot
2023-12-19  5:19 Sam James
2023-05-23  2:52 Sam James
2022-12-08 22:03 James Le Cuirot
2022-12-08 22:03 James Le Cuirot
2022-09-19  6:42 Michał Górny
2022-08-04  7:12 Joonas Niilola
2021-10-23  7:39 James Le Cuirot
2021-10-09 22:20 James Le Cuirot
2021-10-09 22:20 James Le Cuirot
2021-07-26 22:49 James Le Cuirot
2021-07-26 22:49 James Le Cuirot
2021-05-22 23:05 James Le Cuirot
2021-02-08  6:49 Andreas Sturmlechner
2021-01-19 23:07 James Le Cuirot
2020-09-05 23:44 Sam James
2020-01-25 14:19 James Le Cuirot
2020-01-25 14:19 James Le Cuirot
2020-01-07 23:15 James Le Cuirot
2019-11-07 21:28 James Le Cuirot
2019-11-07 21:28 James Le Cuirot
2019-09-15  9:13 Mikle Kolyada
2019-06-10 19:51 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox