public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2015-12-30 22:08 Michael Sterrett
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Sterrett @ 2015-12-30 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     d48f0aa6d1571688edd2e0d6b9d481c648c4c6b6
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 21:53:49 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 21:53:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d48f0aa6

games-fps/quakeforge: clean up inherit; use dep for libsdl; add slot dep for sys-libs/ncurses

Package-Manager: portage-2.2.24

 games-fps/quakeforge/quakeforge-0.7.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 6388f5f..2ca59c7 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit base eutils autotools games
+inherit eutils autotools games
 
 DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
 HOMEPAGE="http://www.quakeforge.net/"
@@ -21,13 +21,13 @@ RDEPEND="
 	virtual/opengl
 	png? ( media-libs/libpng:0 )
 	flac? ( media-libs/flac )
-	sdl? ( media-libs/libsdl )
+	sdl? ( media-libs/libsdl[video] )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 	)
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0 )
 	vorbis? ( media-libs/libogg media-libs/libvorbis )
 	zlib? ( sys-libs/zlib )
 	xv? (


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2015-12-30 22:08 Michael Sterrett
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Sterrett @ 2015-12-30 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     d8c18118cbce6cba778e4ad4c00b6dd3dd19421e
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 22:08:49 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 22:08:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c18118

games-fps/quakeforge: shorter DESCRIPTION and remove unnecessary(?) addpredict

Package-Manager: portage-2.2.24

 games-fps/quakeforge/quakeforge-0.7.2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 2ca59c7..ae11e38 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils autotools games
 
-DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine"
+DESCRIPTION="new 3d engine based off of id Softwares's Quake and QuakeWorld game engine"
 HOMEPAGE="http://www.quakeforge.net/"
 SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 
@@ -65,7 +65,6 @@ src_configure() {
 
 	local tools=${QF_TOOLS:-all}
 
-	addpredict "$(games_get_libdir)"
 	egamesconf \
 		--enable-dependency-tracking \
 		$(use_enable ncurses curses) \


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2016-01-02 16:28 Agostino Sarubbo
  0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2016-01-02 16:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1cbde8529914435bcee467e6d2f8f902c991ba8b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 16:27:01 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan  2 16:27:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbde852

games-fps/quakeforge: amd64 stable wrt bug #570314

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index ae11e38..03c1887 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="cdinstall debug fbcon flac sdl X ncurses png vorbis zlib ipv6 xv dga alsa oss xdg wildmidi"
 RESTRICT="userpriv"
 


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2016-01-17 17:02 Agostino Sarubbo
  0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2016-01-17 17:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9e176b36de069d694741ba161e80d75043d4893a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 16:59:22 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 16:59:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e176b36

games-fps/quakeforge: ppc stable wrt bug #570314

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

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

diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index f4447c4..91a109d 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="cdinstall debug fbcon flac sdl X ncurses png vorbis zlib ipv6 xv dga alsa oss xdg wildmidi"
 RESTRICT="userpriv"
 


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2016-03-31 23:31 Michael Sterrett
  0 siblings, 0 replies; 18+ messages in thread
From: Michael Sterrett @ 2016-03-31 23:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ba7edc1707a40855185a55faafa76a0b0c5768c9
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 23:27:45 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 23:30:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7edc17

games-fps/quakeforge: build with gcc5 (bug #570392)

Package-Manager: portage-2.2.26

 games-fps/quakeforge/quakeforge-0.7.2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 91a109d..1bcffe2 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit eutils autotools games
+inherit eutils flag-o-matic autotools games
 
 DESCRIPTION="new 3d engine based off of id Softwares's Quake and QuakeWorld game engine"
 HOMEPAGE="http://www.quakeforge.net/"
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	eautoreconf
+	append-cflags -std=gnu89 # build with gcc5 (bug #570392)
 }
 
 src_configure() {


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2021-06-07  8:21 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-06-07  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     761243207d1543bfebd359d5f8e1065cb327bf9a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  7 06:59:22 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun  7 08:17:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76124320

games-fps/quakeforge: add github remote-id

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index bd3de0628e4..e686e2fbeaa 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -34,6 +34,7 @@ most portable source tree based on the id Software code.
 		<flag name="xdg">enable XDG support</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">quakeforge/quakeforge</remote-id>
 		<remote-id type="sourceforge">quake</remote-id>
 	</upstream>
 </pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2021-07-23  0:52 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-07-23  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     30e42e006de0ed846f432f35b903962bbed65cb0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 20:32:06 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 00:46:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e42e00

games-fps/quakeforge: re-indent metadata, strip trailing whitespaces

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/metadata.xml | 40 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index a5c31dd9bfe..4cd16f1f610 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -6,29 +6,29 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription>
-QuakeForge is a 3D graphics game engine based on id Software's legendary 
-Quake and QuakeWorld game engine. Our purpose? To improve the state of 
-the game by improving the engine and making it accessable to the largest 
-number of players we can.
+		QuakeForge is a 3D graphics game engine based on id Software's legendary
+		Quake and QuakeWorld game engine. Our purpose? To improve the state of
+		the game by improving the engine and making it accessable to the largest
+		number of players we can.
 
-Arguably the single most important issue on the minds of players today 
-is the rampant cheating which is currently happening on many of the 
-larger servers. It's a serious problem and it really makes a good game 
-hard to find. We're working hard to fix these problems at the engine 
-level.
+		Arguably the single most important issue on the minds of players today
+		is the rampant cheating which is currently happening on many of the
+		larger servers. It's a serious problem and it really makes a good game
+		hard to find. We're working hard to fix these problems at the engine
+		level.
 
-But what good is that if you have to have a copy of our client and the 
-server has to run our server? There are other projects out there and 
-some of them have very unique qualities. QuakeForge is cooperating with 
-QSG, a group comprised of representatives from nearly every known Quake 
-source project to ensure that our clients and servers run with other 
-clients and servers just fine. We have all agreed to implement any 
-effective cheat prevention methods.
+		But what good is that if you have to have a copy of our client and the
+		server has to run our server? There are other projects out there and
+		some of them have very unique qualities. QuakeForge is cooperating with
+		QSG, a group comprised of representatives from nearly every known Quake
+		source project to ensure that our clients and servers run with other
+		clients and servers just fine. We have all agreed to implement any
+		effective cheat prevention methods.
 
-Other things we're doing include merging the two code trees, adding 
-features, and improving the OpenGL renderer. And QuakeForge is still the 
-most portable source tree based on the id Software code.
-</longdescription>
+		Other things we're doing include merging the two code trees, adding
+		features, and improving the OpenGL renderer. And QuakeForge is still the
+		most portable source tree based on the id Software code.
+	</longdescription>
 	<use>
 		<flag name="client">Build Normal and QuakeWorld clients alongside the servers</flag>
 		<flag name="wildmidi">Use <pkg>media-sound/wildmidi</pkg> for midi support</flag>


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2021-07-23  0:52 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-07-23  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     fc1461ede38a8006fc7662c8bc0a252e3b87fe54
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 23:51:52 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 00:49:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1461ed

games-fps/quakeforge: add live ebuild

Undergoing active development and may be useful to prepare/pick
new snapshots until upstream starts doing releases again.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-9999.ebuild | 163 ++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
new file mode 100644
index 00000000000..03d46dcf580
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
+else
+	MY_COMMIT=""
+	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
+HOMEPAGE="http://www.quakeforge.net/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib"
+
+RDEPEND="
+	client? (
+		media-libs/libsamplerate
+		net-misc/curl
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXxf86vm
+		alsa? ( media-libs/alsa-lib )
+		flac? ( media-libs/flac )
+		jack? ( virtual/jack )
+		sdl? ( media-libs/libsdl[sound] )
+		vorbis? ( media-libs/libvorbis )
+		vulkan? ( media-libs/vulkan-loader )
+		wildmidi? ( media-sound/wildmidi )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	client? (
+		x11-base/xorg-proto
+		vulkan? ( dev-util/vulkan-headers )
+	)"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		media-gfx/transfig
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.2_p20210722-skipped-tests.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > .tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	qf_client() {
+		echo $(usex client $(use_enable ${1}) --disable-${1})
+	}
+
+	local econfargs=(
+		$(qf_client alsa)
+		$(qf_client flac)
+		$(qf_client jack)
+		$(qf_client oss)
+		$(qf_client sdl)
+		$(qf_client vorbis)
+		$(qf_client vulkan)
+		$(qf_client wildmidi)
+		$(use_enable client sound)
+		$(use_enable client vidmode)
+		$(use_enable debug)
+		$(use_enable ncurses curses)
+		$(use_enable png)
+		$(use_enable zlib)
+		$(use_with client x)
+		--disable-Werror
+		--disable-dga
+		--enable-xdg
+		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
+		--with-clients=$(usev client x11)
+		--with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
+		--with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
+		--with-sharepath="${EPREFIX}"/usr/share/quake1
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doxygen/html/. )
+
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Before you can play (using nq-x11 or qw-client-x11), you must ensure
+that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
+at one of these locations with lowercase filenames:
+	- '~/.local/share/${PN}/id1/pak0.pak'
+	- '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
+
+You can add them yourself or use either of:
+	- games-fps/quake1-data: install from a Quake CD-ROM
+	- games-fps/quake1-demodata: pak0.pak only (limited demo)
+
+Key binds notes:
+	Defaults ('imt_mod' table) expect you to set key binds manually in:
+	- '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
+	For the in-game bind menu to be usable ('imt_0' table), bring up the
+	console with backtick \`, and run 'imt imt_0' (only needed once).
+	A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
+
+Audio/Video notes:
+	Can add settings in:
+	- '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
+	Examples:
+	- set vid_width 800
+	- set vid_height 600
+	- set snd_output sdl (or alsa, jack, oss -- sdl can do pulseaudio)
+	- setrom vid_render gl (or vulkan, sw for software rendering)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
+		elog "Migration may be needed for ${PN}'s home paths, now using:"
+		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
+		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
+		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
+	fi
+
+	if use vulkan; then
+		ewarn "You've enabled the new vulkan support that is still experimental and yet"
+		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
+		ewarn "line option to revert to GL."
+	fi
+}


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2021-08-09 16:23 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-08-09 16:23 UTC (permalink / raw
  To: gentoo-commits

commit:     20dd46cae52d190e8d0232541863375412fe7720
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  9 16:21:09 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 16:22:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20dd46ca

games-fps/quakeforge: replace patch with sed for live ebuild

These get changed around a lot, this should hopefully fail less often

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 03d46dcf580..429ef137bf1 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -56,13 +56,13 @@ BDEPEND="
 		media-gfx/transfig
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.2_p20210722-skipped-tests.patch
-)
-
 src_prepare() {
 	default
 
+	# These seem to fail at high precision and shouldn't affect normal use.
+	# quat/simd: may fail with -mavx, sebvf: random? (likely hardware related)
+	sed -i '/test-\(quat\|simd\|sebvf\)/d' libs/util/test/Makemodule.am || die
+
 	echo ${PV} > .tarball-version || die
 	eautoreconf
 }


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2021-08-09 16:41 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2021-08-09 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c9a0b97bc805bed177baa7b9d160fe2e1acae993
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  9 16:35:51 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 16:40:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a0b97b

games-fps/quakeforge: pass new --disable-simd for live ebuild

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 429ef137bf1..6013dac54d3 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -90,6 +90,7 @@ src_configure() {
 		$(use_with client x)
 		--disable-Werror
 		--disable-dga
+		--disable-simd # all this does is append -mavx2 and similar
 		--enable-xdg
 		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
 		--with-clients=$(usev client x11)


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2022-01-05  1:35 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2022-01-05  1:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a6836bac5fd81a343561ecc525b1fc6a82fcd332
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  5 01:23:38 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan  5 01:34:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6836bac

games-fps/quakeforge: minor live ebuild updates

Current HEAD has working tests with glibc-2.34 wrt bug #807319
(but the failure had no real consequence, runtime not affected).

Not adding a new snapshot yet given there's been major refactoring
of the input system and in-game key rebinding seem not re-implemented
yet (this is fine if using .cfg directly, but is unintuitive).

Removed dated postinst messages, vulkan backend seem to have
improved a fair deal.

Bug: https://bugs.gentoo.org/807319
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-9999.ebuild | 31 ++++++++++-------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 6013dac54d34..5a6d465477c4 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,9 +9,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
 else
-	MY_COMMIT=""
-	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+	QUAKEFORGE_COMMIT=""
+	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${QUAKEFORGE_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${QUAKEFORGE_COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -29,6 +29,8 @@ RDEPEND="
 		virtual/opengl
 		x11-libs/libX11
 		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
 		x11-libs/libXxf86vm
 		alsa? ( media-libs/alsa-lib )
 		flac? ( media-libs/flac )
@@ -69,7 +71,7 @@ src_prepare() {
 
 src_configure() {
 	qf_client() {
-		echo $(usex client $(use_enable ${1}) --disable-${1})
+		usex client $(use_enable ${1}) --disable-${1}
 	}
 
 	local econfargs=(
@@ -116,9 +118,9 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Before you can play (using nq-x11 or qw-client-x11), you must ensure
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Before you can play (using nq-x11 or qw-client-x11), you must ensure
 that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
 at one of these locations with lowercase filenames:
 	- '~/.local/share/${PN}/id1/pak0.pak'
@@ -148,17 +150,4 @@ Audio/Video notes:
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
-		elog "Migration may be needed for ${PN}'s home paths, now using:"
-		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
-		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
-		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
-	fi
-
-	if use vulkan; then
-		ewarn "You've enabled the new vulkan support that is still experimental and yet"
-		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
-		ewarn "line option to revert to GL."
-	fi
 }


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2022-07-19  1:01 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2022-07-19  1:01 UTC (permalink / raw
  To: gentoo-commits

commit:     18074a63bbe978e0aea255e395287188fd16432e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 00:53:47 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 01:00:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18074a63

games-fps/quakeforge: filter-lto

This is already all sort of fragile and tempting to last-rite,
probably not worth trying to figure lto out.

Closes: https://bugs.gentoo.org/858755
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild | 6 ++++--
 games-fps/quakeforge/quakeforge-9999.ebuild            | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
index 1a58d8f86151..00b38e91bb28 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools readme.gentoo-r1 toolchain-funcs
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -68,6 +68,8 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto #858755
+
 	qf_client() {
 		echo $(usex client $(use_enable ${1}) --disable-${1})
 	}

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 5a6d465477c4..8b48e19f6810 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools readme.gentoo-r1 toolchain-funcs
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -70,6 +70,8 @@ src_prepare() {
 }
 
 src_configure() {
+	filter-lto #858755
+
 	qf_client() {
 		usex client $(use_enable ${1}) --disable-${1}
 	}


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2022-09-10  8:41 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-09-10  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     cda8d74c42851638c75005afa77eadc4aa51330b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 08:35:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 08:40:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda8d74c

games-fps/quakeforge: add media-libs/flac subslot dep

media-libs/flac-1.4.0 breaks ABI.

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

 ...orge-0.7.2_p20210722.ebuild => quakeforge-0.7.2_p20210722-r1.ebuild} | 2 +-
 games-fps/quakeforge/quakeforge-9999.ebuild                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
similarity index 99%
rename from games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
rename to games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
index 00b38e91bb28..ec5f4c092af3 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210722.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXxf86vm
 		alsa? ( media-libs/alsa-lib )
-		flac? ( media-libs/flac )
+		flac? ( media-libs/flac:= )
 		jack? ( virtual/jack )
 		sdl? ( media-libs/libsdl[sound] )
 		vorbis? ( media-libs/libvorbis )

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 8b48e19f6810..dd9873235d89 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 		x11-libs/libXi
 		x11-libs/libXxf86vm
 		alsa? ( media-libs/alsa-lib )
-		flac? ( media-libs/flac )
+		flac? ( media-libs/flac:= )
 		jack? ( virtual/jack )
 		sdl? ( media-libs/libsdl[sound] )
 		vorbis? ( media-libs/libvorbis )


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2022-12-04 17:11 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2022-12-04 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     38bff1e0d5798b6f2e9285f532a2cde0672c6328
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 17:08:00 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 17:08:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bff1e0

games-fps/quakeforge: unset YACC and let configure handle it

Already BDEPEND on bison

Closes: https://bugs.gentoo.org/884287
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild | 1 +
 games-fps/quakeforge/quakeforge-9999.ebuild               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
index ec5f4c092af3..7bdc0b312807 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
@@ -69,6 +69,7 @@ src_prepare() {
 
 src_configure() {
 	filter-lto #858755
+	unset YACC #884287
 
 	qf_client() {
 		echo $(usex client $(use_enable ${1}) --disable-${1})

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index dd9873235d89..b01e565bec43 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -71,6 +71,7 @@ src_prepare() {
 
 src_configure() {
 	filter-lto #858755
+	unset YACC #884287
 
 	qf_client() {
 		usex client $(use_enable ${1}) --disable-${1}


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2023-03-25  0:02 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2023-03-25  0:02 UTC (permalink / raw
  To: gentoo-commits

commit:     566f6914104b437b073c896f0c906d430e30a631
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 00:00:04 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 00:01:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566f6914

games-fps/quakeforge: unset LEX to ensure flex

This package is rather fragile, and (any) alternatives have
a tendency to not work.

Closes: https://bugs.gentoo.org/902997
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild | 4 ++--
 games-fps/quakeforge/quakeforge-9999.ebuild               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
index 7bdc0b312807..39d69b2b24e3 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,7 +69,7 @@ src_prepare() {
 
 src_configure() {
 	filter-lto #858755
-	unset YACC #884287
+	unset LEX YACC #902997,884287
 
 	qf_client() {
 		echo $(usex client $(use_enable ${1}) --disable-${1})

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index b01e565bec43..9c6f72e80f93 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -71,7 +71,7 @@ src_prepare() {
 
 src_configure() {
 	filter-lto #858755
-	unset YACC #884287
+	unset LEX YACC #902997,884287
 
 	qf_client() {
 		usex client $(use_enable ${1}) --disable-${1}


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

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

commit:     326a57a6d3d39754cd66664ae9d9fbde751c3ff0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 02:49:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 02:51:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326a57a6

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

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

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

diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
index 6e2db6623434..5114e2157d9b 100644
--- a/games-fps/quakeforge/metadata.xml
+++ b/games-fps/quakeforge/metadata.xml
@@ -31,7 +31,6 @@
 	</longdescription>
 	<use>
 		<flag name="client">Build Normal and QuakeWorld clients alongside the servers</flag>
-		<flag name="vulkan">Enable vulkan renderer (experimental)</flag>
 		<flag name="wildmidi">Use <pkg>media-sound/wildmidi</pkg> for midi support</flag>
 	</use>
 	<upstream>


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2023-11-13  7:34 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-11-13  7:34 UTC (permalink / raw
  To: gentoo-commits

commit:     f628eecd507ec310771db2c0e25dffb4c8124034
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 07:33:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 07:33:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f628eecd

games-fps/quakeforge: migrate to fig2dev

Closes: https://bugs.gentoo.org/917250
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ebuild => quakeforge-0.7.2_p20210722-r2.ebuild} | 40 ++++++++++++++--------
 games-fps/quakeforge/quakeforge-9999.ebuild        |  2 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild
similarity index 77%
copy from games-fps/quakeforge/quakeforge-9999.ebuild
copy to games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild
index 9c6f72e80f93..e904e35f9cd1 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild
@@ -9,9 +9,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
 else
-	QUAKEFORGE_COMMIT=""
-	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${QUAKEFORGE_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${QUAKEFORGE_COMMIT}"
+	MY_COMMIT="e799a7ae45b0ab2ad7b642953277db8ccf256cf8"
+	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -29,8 +29,6 @@ RDEPEND="
 		virtual/opengl
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
 		x11-libs/libXxf86vm
 		alsa? ( media-libs/alsa-lib )
 		flac? ( media-libs/flac:= )
@@ -55,16 +53,16 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
-		media-gfx/transfig
+		>=media-gfx/fig2dev-3.2.9-r1
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-skipped-tests.patch
+)
+
 src_prepare() {
 	default
 
-	# These seem to fail at high precision and shouldn't affect normal use.
-	# quat/simd: may fail with -mavx, sebvf: random? (likely hardware related)
-	sed -i '/test-\(quat\|simd\|sebvf\)/d' libs/util/test/Makemodule.am || die
-
 	echo ${PV} > .tarball-version || die
 	eautoreconf
 }
@@ -74,7 +72,7 @@ src_configure() {
 	unset LEX YACC #902997,884287
 
 	qf_client() {
-		usex client $(use_enable ${1}) --disable-${1}
+		echo $(usex client $(use_enable ${1}) --disable-${1})
 	}
 
 	local econfargs=(
@@ -95,7 +93,6 @@ src_configure() {
 		$(use_with client x)
 		--disable-Werror
 		--disable-dga
-		--disable-simd # all this does is append -mavx2 and similar
 		--enable-xdg
 		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
 		--with-clients=$(usev client x11)
@@ -121,9 +118,9 @@ src_install() {
 
 	find "${ED}" -name '*.la' -delete || die
 
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Before you can play (using nq-x11 or qw-client-x11), you must ensure
+	local DISABLE_AUTOFORMATTING="yes"
+	local DOC_CONTENTS=\
+"Before you can play (using nq-x11 or qw-client-x11), you must ensure
 that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
 at one of these locations with lowercase filenames:
 	- '~/.local/share/${PN}/id1/pak0.pak'
@@ -153,4 +150,17 @@ Audio/Video notes:
 
 pkg_postinst() {
 	readme.gentoo_print_elog
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
+		elog "Migration may be needed for ${PN}'s home paths, now using:"
+		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
+		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
+		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
+	fi
+
+	if use vulkan; then
+		ewarn "You've enabled the new vulkan support that is still experimental and yet"
+		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
+		ewarn "line option to revert to GL."
+	fi
 }

diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 9c6f72e80f93..df728f289149 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -55,7 +55,7 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
-		media-gfx/transfig
+		>=media-gfx/fig2dev-3.2.9-r1
 	)"
 
 src_prepare() {


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

* [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/
@ 2024-01-08 12:59 Ionen Wolkens
  0 siblings, 0 replies; 18+ messages in thread
From: Ionen Wolkens @ 2024-01-08 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     91ca06007abf80f224155f2000e889c774f14c60
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 10:27:10 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 12:57:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ca0600

games-fps/quakeforge: drop 0.7.2_p20210722-r1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../quakeforge-0.7.2_p20210722-r1.ebuild           | 166 ---------------------
 1 file changed, 166 deletions(-)

diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
deleted file mode 100644
index 39d69b2b24e3..000000000000
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
-else
-	MY_COMMIT="e799a7ae45b0ab2ad7b642953277db8ccf256cf8"
-	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
-HOMEPAGE="http://www.quakeforge.net/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib"
-
-RDEPEND="
-	client? (
-		media-libs/libsamplerate
-		net-misc/curl
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		alsa? ( media-libs/alsa-lib )
-		flac? ( media-libs/flac:= )
-		jack? ( virtual/jack )
-		sdl? ( media-libs/libsdl[sound] )
-		vorbis? ( media-libs/libvorbis )
-		vulkan? ( media-libs/vulkan-loader )
-		wildmidi? ( media-sound/wildmidi )
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="
-	${RDEPEND}
-	client? (
-		x11-base/xorg-proto
-		vulkan? ( dev-util/vulkan-headers )
-	)"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/transfig
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-skipped-tests.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > .tarball-version || die
-	eautoreconf
-}
-
-src_configure() {
-	filter-lto #858755
-	unset LEX YACC #902997,884287
-
-	qf_client() {
-		echo $(usex client $(use_enable ${1}) --disable-${1})
-	}
-
-	local econfargs=(
-		$(qf_client alsa)
-		$(qf_client flac)
-		$(qf_client jack)
-		$(qf_client oss)
-		$(qf_client sdl)
-		$(qf_client vorbis)
-		$(qf_client vulkan)
-		$(qf_client wildmidi)
-		$(use_enable client sound)
-		$(use_enable client vidmode)
-		$(use_enable debug)
-		$(use_enable ncurses curses)
-		$(use_enable png)
-		$(use_enable zlib)
-		$(use_with client x)
-		--disable-Werror
-		--disable-dga
-		--enable-xdg
-		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
-		--with-clients=$(usev client x11)
-		--with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
-		--with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
-		--with-sharepath="${EPREFIX}"/usr/share/quake1
-	)
-
-	econf "${econfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doxygen/html/. )
-
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Before you can play (using nq-x11 or qw-client-x11), you must ensure
-that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
-at one of these locations with lowercase filenames:
-	- '~/.local/share/${PN}/id1/pak0.pak'
-	- '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
-
-You can add them yourself or use either of:
-	- games-fps/quake1-data: install from a Quake CD-ROM
-	- games-fps/quake1-demodata: pak0.pak only (limited demo)
-
-Key binds notes:
-	Defaults ('imt_mod' table) expect you to set key binds manually in:
-	- '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
-	For the in-game bind menu to be usable ('imt_0' table), bring up the
-	console with backtick \`, and run 'imt imt_0' (only needed once).
-	A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
-
-Audio/Video notes:
-	Can add settings in:
-	- '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
-	Examples:
-	- set vid_width 800
-	- set vid_height 600
-	- set snd_output sdl (or alsa, jack, oss -- sdl can do pulseaudio)
-	- setrom vid_render gl (or vulkan, sw for software rendering)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
-		elog "Migration may be needed for ${PN}'s home paths, now using:"
-		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
-		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
-		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
-	fi
-
-	if use vulkan; then
-		ewarn "You've enabled the new vulkan support that is still experimental and yet"
-		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
-		ewarn "line option to revert to GL."
-	fi
-}


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

end of thread, other threads:[~2024-01-08 12:59 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-05  1:35 [gentoo-commits] repo/gentoo:master commit in: games-fps/quakeforge/ Ionen Wolkens
  -- strict thread matches above, loose matches on Subject: below --
2024-01-08 12:59 Ionen Wolkens
2023-11-13  7:34 Sam James
2023-05-23  2:52 Sam James
2023-03-25  0:02 Ionen Wolkens
2022-12-04 17:11 Ionen Wolkens
2022-09-10  8:41 Sam James
2022-07-19  1:01 Ionen Wolkens
2021-08-09 16:41 Ionen Wolkens
2021-08-09 16:23 Ionen Wolkens
2021-07-23  0:52 Ionen Wolkens
2021-07-23  0:52 Ionen Wolkens
2021-06-07  8:21 Ionen Wolkens
2016-03-31 23:31 Michael Sterrett
2016-01-17 17:02 Agostino Sarubbo
2016-01-02 16:28 Agostino Sarubbo
2015-12-30 22:08 Michael Sterrett
2015-12-30 22:08 Michael Sterrett

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