public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2019-04-20  6:52 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2019-04-20  6:52 UTC (permalink / raw
  To: gentoo-commits

commit:     79371c6073162a55dd76cfd218c1b080da342aea
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Apr  7 22:54:36 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 06:51:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79371c60

games-fps/yamagi-quake2: version bump to 7.40

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                   |   4 +
 .../yamagi-quake2-addon-respect-flags-r2.patch     |  33 +++++
 games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild  | 149 +++++++++++++++++++++
 3 files changed, 186 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 068b82c3215..8a129d523fa 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,9 @@
 DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
+DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
+DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
+DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
 DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
+DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
new file mode 100644
index 00000000000..bb800aeaf3c
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
@@ -0,0 +1,33 @@
+--- quake2-xatrix-2.06.orig/Makefile	2019-02-05 10:56:06.000000000 +0300
++++ quake2-xatrix-2.06/Makefile	2019-04-08 01:24:04.124176498 +0300
+@@ -75,11 +75,11 @@
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch i386 -arch x86_64
+ else
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -MMD -fwrapv
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -107,11 +107,11 @@
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch i386 -arch x86_64
++LDFLAGS += -shared -arch i386 -arch x86_64
+ else ifeq ($(OSTYPE), Windows)
+-LDFLAGS := -shared -static-libgcc
++LDFLAGS += -shared -static-libgcc
+ else
+-LDFLAGS := -shared
++LDFLAGS += -shared
+ endif
+ 
+ # ----------

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
new file mode 100644
index 00000000000..5e8aa0b53d2
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+CTF_V=1.06
+ROGUE_V=2.05
+XATRIX_V=2.06
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
+	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
+	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
+	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
+
+COMMON_DEPEND="
+	client? (
+		media-libs/libsdl2[video]
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/quake2-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+)
+DOCS=( CHANGELOG README.md doc/. )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2022-04-26  4:13 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-04-26  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b17a1ad38a204f915a59f2df1fb63b3029d8fc43
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Apr 25 22:04:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 04:13:01 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17a1ad3

games-fps/yamagi-quake2: fix musl build

Closes: https://bugs.gentoo.org/831793

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/25204
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/yamagi-quake2-8.01-execinfo.patch        | 49 ++++++++++++++++++++++
 games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild  |  3 ++
 2 files changed, 52 insertions(+)

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-8.01-execinfo.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-8.01-execinfo.patch
new file mode 100644
index 000000000000..40de2342fa8e
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-8.01-execinfo.patch
@@ -0,0 +1,49 @@
+From e4a23de95ac1b1333a8f349a1ead82999bca3862 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sun, 17 Apr 2022 17:07:28 +0300
+Subject: [PATCH] build: Make execinfo optional
+
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 3f9d72ce..99048a82 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,6 +62,8 @@ WITH_SYSTEMWIDE:=no
+ # MUST NOT be surrounded by quotation marks!
+ WITH_SYSTEMDIR:=""
+ 
++WITH_EXECINFO:=yes
++
+ # This will set the build options to create an MacOS .app-bundle.
+ # The app-bundle itself will not be created, but the runtime paths
+ # will be set to expect the game-data in *.app/
+@@ -406,6 +408,7 @@ config:
+ 	@echo "WITH_RPATH = $(WITH_RPATH)"
+ 	@echo "WITH_SYSTEMWIDE = $(WITH_SYSTEMWIDE)"
+ 	@echo "WITH_SYSTEMDIR = $(WITH_SYSTEMDIR)"
++	@echo "WITH_EXECINFO = $(WITH_EXECINFO)"
+ 	@echo "============================"
+ 	@echo ""
+ 
+@@ -492,6 +495,7 @@ release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1
+ endif
+ endif
+ 
++ifeq ($(WITH_EXECINFO),yes)
+ ifeq ($(YQ2_OSTYPE), Linux)
+ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+ endif
+@@ -523,6 +527,7 @@ ifeq ($(YQ2_OSTYPE), Haiku)
+ release/quake2 : CFLAGS += -DHAVE_EXECINFO
+ release/quake2 : LDLIBS += -lexecinfo
+ endif
++endif
+ 
+ ifeq ($(WITH_RPATH),yes)
+ ifeq ($(YQ2_OSTYPE), Darwin)
+-- 
+2.35.1
+

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
index 2b7bbeeab057..12f94411a485 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	client? ( vulkan? ( dev-util/vulkan-headers ) )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
+
 DOCS=( CHANGELOG README.md doc )
 
 src_compile() {
@@ -51,6 +53,7 @@ src_compile() {
 	local targets=( game )
 	local emakeargs=(
 		VERBOSE=1
+		WITH_EXECINFO=$(usex elibc_musl no yes)
 		WITH_SYSTEMWIDE=yes
 		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
 		WITH_OPENAL=$(usex openal)


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2020-04-17 15:10 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-04-17 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     5bcc65368c29b179187f1fa9486d83c2fea9405c
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Mar  8 00:09:49 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 15:10:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bcc6536

games-fps/yamagi-quake2: Version bump to 7.43

Closes: https://bugs.gentoo.org/717510
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                   |   4 +
 .../yamagi-quake2-addon-respect-flags-r4.patch     |  33 +++++
 games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild  | 152 +++++++++++++++++++++
 3 files changed, 189 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 522c9807500..7c648cb4640 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,7 +1,11 @@
 DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
 DIST quake2-7.42.tar.xz 1987332 BLAKE2B 63ced75746eb031faf949c6b094ec607076f481b8d97eca242f9bf6fd6325afc8dfb5f98fe4f8ba5c5e87b721392f613031fc204b775634fc5292a26fef1d76c SHA512 0f51204fcf14ecb3f1f654e6ee19207836cf4642022569ef202bc12f312f76dbd43695aa4d9f9fb70c8b023f42d1a8fcec25f472a32175ebb0a308211fa40cc0
+DIST quake2-7.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
+DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
 DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
 DIST quake2-rogue-2.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6
+DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
 DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
 DIST quake2-xatrix-2.07.tar.xz 192404 BLAKE2B 54772f1158af82211a5c925676e1399bd9debfa8f336a566dd7c22c6f50eb488030c871a7952b9eb00a7a8498560aed332dfd388074bb5a733ed5e979d59d9dc SHA512 72400afa98faf38559dfbc6dcfd01a16902adc782065bc1bbae4d773b5c139543d79f465195db72f0dbaf33999c667c65fd3582a8029db5b50ea5295d278b2a7
+DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch
new file mode 100644
index 00000000000..86c794b99e5
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch
@@ -0,0 +1,33 @@
+--- a/Makefile	2020-02-24 19:01:11.000000000 +0300
++++ b/Makefile	2020-03-08 03:07:40.480074095 +0300
+@@ -66,11 +66,11 @@ endif
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch x86_64
+ else
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -MMD -fwrapv
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -93,11 +93,11 @@ endif
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch x86_64
++LDFLAGS += -shared -arch x86_64
+ else ifeq ($(OSTYPE), Windows)
+-LDFLAGS := -shared -static-libgcc
++LDFLAGS += -shared -static-libgcc
+ else
+-LDFLAGS := -shared -lm
++LDFLAGS += -shared -lm
+ endif
+ 
+ # ----------

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
new file mode 100644
index 00000000000..e9db574e8b5
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+CTF_V="1.07"
+ROGUE_V="2.07"
+XATRIX_V="2.08"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
+	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
+	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
+	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender ) )
+"
+
+DEPEND="
+	client? (
+		media-libs/libsdl2[video]
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+)
+DOCS=( CHANGELOG README.md doc )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		if [[ ${addon} = ctf ]]; then
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r4.patch
+		else
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r3.patch
+		fi
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2020-02-24  5:55 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2020-02-24  5:55 UTC (permalink / raw
  To: gentoo-commits

commit:     bcd93e6c5109b0d2bc2d38a99544e97707cbe94a
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue Dec 24 11:20:18 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 05:25:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd93e6c

games-fps/yamagi-quake2: version bump to 7.42

Closes: https://bugs.gentoo.org/708690
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14112
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                   |   3 +
 .../files/yamagi-quake2-7.42-fno-common.patch      |  92 ++++++++++++
 .../yamagi-quake2-addon-respect-flags-r3.patch     |  33 +++++
 games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild  | 155 +++++++++++++++++++++
 4 files changed, 283 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 048d8efc7a0..522c9807500 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,7 @@
 DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
+DIST quake2-7.42.tar.xz 1987332 BLAKE2B 63ced75746eb031faf949c6b094ec607076f481b8d97eca242f9bf6fd6325afc8dfb5f98fe4f8ba5c5e87b721392f613031fc204b775634fc5292a26fef1d76c SHA512 0f51204fcf14ecb3f1f654e6ee19207836cf4642022569ef202bc12f312f76dbd43695aa4d9f9fb70c8b023f42d1a8fcec25f472a32175ebb0a308211fa40cc0
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
+DIST quake2-rogue-2.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6
 DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
+DIST quake2-xatrix-2.07.tar.xz 192404 BLAKE2B 54772f1158af82211a5c925676e1399bd9debfa8f336a566dd7c22c6f50eb488030c871a7952b9eb00a7a8498560aed332dfd388074bb5a733ed5e979d59d9dc SHA512 72400afa98faf38559dfbc6dcfd01a16902adc782065bc1bbae4d773b5c139543d79f465195db72f0dbaf33999c667c65fd3582a8029db5b50ea5295d278b2a7

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch
new file mode 100644
index 00000000000..6dc8794b874
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch
@@ -0,0 +1,92 @@
+From 60a4bd330689b2378e49f2335209bd64a653fab2 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 10 Feb 2020 16:09:09 +0300
+Subject: [PATCH] Fix build with -fno-common
+
+GCC 10 defaults to -fno-common.
+
+Closes #516
+---
+ src/client/cl_main.c       | 18 ------------------
+ src/client/header/client.h |  1 +
+ src/client/input/sdl.c     |  2 --
+ 3 files changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/src/client/cl_main.c b/src/client/cl_main.c
+index 135407d1..7fc1e6df 100644
+--- a/src/client/cl_main.c
++++ b/src/client/cl_main.c
+@@ -35,8 +35,6 @@ void CL_Connect_f(void);
+ void CL_Rcon_f(void);
+ void CL_CheckForResend(void);
+ 
+-cvar_t *freelook;
+-
+ cvar_t *rcon_client_password;
+ cvar_t *rcon_address;
+ 
+@@ -58,14 +56,6 @@ cvar_t *cl_showclamp;
+ cvar_t *cl_paused;
+ cvar_t *cl_loadpaused;
+ 
+-cvar_t *lookstrafe;
+-cvar_t *sensitivity;
+-
+-cvar_t *m_pitch;
+-cvar_t *m_yaw;
+-cvar_t *m_forward;
+-cvar_t *m_side;
+-
+ cvar_t *cl_lightlevel;
+ 
+ /* userinfo */
+@@ -516,14 +506,6 @@ CL_InitLocal(void)
+ 	cl_anglespeedkey = Cvar_Get("cl_anglespeedkey", "1.5", 0);
+ 
+ 	cl_run = Cvar_Get("cl_run", "0", CVAR_ARCHIVE);
+-	freelook = Cvar_Get("freelook", "1", CVAR_ARCHIVE);
+-	lookstrafe = Cvar_Get("lookstrafe", "0", CVAR_ARCHIVE);
+-	sensitivity = Cvar_Get("sensitivity", "3", CVAR_ARCHIVE);
+-
+-	m_pitch = Cvar_Get("m_pitch", "0.022", CVAR_ARCHIVE);
+-	m_yaw = Cvar_Get("m_yaw", "0.022", 0);
+-	m_forward = Cvar_Get("m_forward", "1", 0);
+-	m_side = Cvar_Get("m_side", "1", 0);
+ 
+ 	cl_shownet = Cvar_Get("cl_shownet", "0", 0);
+ 	cl_showmiss = Cvar_Get("cl_showmiss", "0", 0);
+diff --git a/src/client/header/client.h b/src/client/header/client.h
+index 1a31a1ca..b42abc02 100644
+--- a/src/client/header/client.h
++++ b/src/client/header/client.h
+@@ -302,6 +302,7 @@ extern	cvar_t	*cl_timedemo;
+ extern	cvar_t	*cl_vwep;
+ extern	cvar_t  *horplus;
+ extern	cvar_t	*cin_force43;
++extern	cvar_t	*vid_fullscreen;
+ 
+ typedef struct
+ {
+diff --git a/src/client/input/sdl.c b/src/client/input/sdl.c
+index 3c7356fa..c8055f3b 100644
+--- a/src/client/input/sdl.c
++++ b/src/client/input/sdl.c
+@@ -62,7 +62,6 @@ int sys_frame_time;
+ qboolean joy_altselector_pressed = false;
+ 
+ // Console Variables
+-cvar_t *vid_fullscreen;
+ cvar_t *freelook;
+ cvar_t *lookstrafe;
+ cvar_t *m_forward;
+@@ -1246,7 +1245,6 @@ IN_Init(void)
+ 	joy_axis_triggerleft_threshold = Cvar_Get("joy_axis_triggerleft_threshold", "0.15", CVAR_ARCHIVE);
+ 	joy_axis_triggerright_threshold = Cvar_Get("joy_axis_triggerright_threshold", "0.15", CVAR_ARCHIVE);
+ 
+-	vid_fullscreen = Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE);
+ 	windowed_mouse = Cvar_Get("windowed_mouse", "1", CVAR_USERINFO | CVAR_ARCHIVE);
+ 
+ 	Cmd_AddCommand("+mlook", IN_MLookDown);
+-- 
+2.24.1
+

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r3.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r3.patch
new file mode 100644
index 00000000000..c7cf611ab96
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r3.patch
@@ -0,0 +1,33 @@
+--- quake2-xatrix-2.06.orig/Makefile	2019-02-05 10:56:06.000000000 +0300
++++ quake2-xatrix-2.06/Makefile	2019-04-08 01:24:04.124176498 +0300
+@@ -75,11 +75,11 @@
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch i386 -arch x86_64
+ else
+-CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -MMD -fwrapv
++CFLAGS += -std=gnu99 -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -107,11 +107,11 @@
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch i386 -arch x86_64
++LDFLAGS += -shared -arch i386 -arch x86_64
+ else ifeq ($(OSTYPE), Windows)
+-LDFLAGS := -shared -static-libgcc
++LDFLAGS += -shared -static-libgcc
+ else
+-LDFLAGS := -shared -lm
++LDFLAGS += -shared -lm
+ endif
+ 
+ # ----------

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild
new file mode 100644
index 00000000000..052af9137a4
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+CTF_V="1.06"
+ROGUE_V="2.06"
+XATRIX_V="2.07"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
+	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
+	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
+	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender ) )
+"
+
+COMMON_DEPEND="
+	client? (
+		media-libs/libsdl2[video]
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
+DEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/quake2-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+	"${FILESDIR}"/${PN}-7.42-fno-common.patch
+)
+DOCS=( CHANGELOG README.md doc/. )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		if [[ ${addon} = ctf ]]; then
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
+		else
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r3.patch
+		fi
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2019-06-03 15:54 Stefan Strogin
  0 siblings, 0 replies; 7+ messages in thread
From: Stefan Strogin @ 2019-06-03 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     e5ad96c31f184961949a1793aca53f91bdbb038a
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:52:25 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 15:54:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ad96c3

games-fps/yamagi-quake2: remove old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                   |   4 -
 .../files/yamagi-quake2-addon-respect-flags.patch  |  30 -----
 games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild  | 149 ---------------------
 3 files changed, 183 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index bc7206ff191..dbc41660ecf 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,9 +1,5 @@
-DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
 DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
-DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
-DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
 DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
-DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
 DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
deleted file mode 100644
index d767f04d4b0..00000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile	2017-05-25 12:45:51.000000000 +0300
-+++ b/Makefile	2018-01-14 17:38:34.540167879 +0300
-@@ -64,11 +64,11 @@
- #
- # -MMD to generate header dependencies.
- ifeq ($(OSTYPE), Darwin)
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -fwrapv -arch i386 -arch x86_64
- else
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -MMD -fwrapv
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -MMD -fwrapv
- endif
- 
- # ----------
-@@ -80,9 +80,9 @@
- 
- # Base LDFLAGS.
- ifeq ($(OSTYPE), Darwin)
--LDFLAGS := -shared -arch i386 -arch x86_64 
-+LDFLAGS += -shared -arch i386 -arch x86_64 
- else
--LDFLAGS := -shared
-+LDFLAGS += -shared
- endif
- 
- # ----------

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
deleted file mode 100644
index f8c0f14af23..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
-	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
-	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
-	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
-
-COMMON_DEPEND="
-	client? (
-		media-libs/libsdl2[video]
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	client? ( openal? ( media-libs/openal ) )
-"
-
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-)
-DOCS=( CHANGELOG CONTRIBUTE README.md )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2019-04-20  6:52 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2019-04-20  6:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a558d682eaa5d62018c226152f7476e741a34900
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Apr  7 22:58:03 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 06:52:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a558d682

games-fps/yamagi-quake2: remove old

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/11634
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                   |   1 -
 .../yamagi-quake2/files/yamagi-quake2-zlib.patch   |  17 ---
 .../yamagi-quake2/yamagi-quake2-7.21-r1.ebuild     | 155 ---------------------
 3 files changed, 173 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 8a129d523fa..efdd4db13ee 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,3 @@
-DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
 DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
deleted file mode 100644
index 1de79c98690..00000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/383179
-
-Upstream removed OF macro definition:
-https://github.com/yquake2/yquake2/commit/716d72a295c9247b3c88ccd180bb7a517ed99e13
-
---- a/src/common/unzip/ioapi.h	2018-03-10 20:24:21.000000000 +0300
-+++ b/src/common/unzip/ioapi.h	2018-04-10 00:34:08.688675097 +0300
-@@ -120,6 +120,9 @@
- #define ZLIB_FILEFUNC_MODE_EXISTING (4)
- #define ZLIB_FILEFUNC_MODE_CREATE   (8)
- 
-+#ifdef _Z_OF
-+#define OF _Z_OF
-+#endif
- 
- #ifndef ZCALLBACK
-  #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
deleted file mode 100644
index 843343c0aca..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
-	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
-	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
-	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal +opengl rogue softrender xatrix"
-REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
-
-RDEPEND="sys-libs/zlib:0=
-	client? (
-		media-libs/libsdl2[video]
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-	"${FILESDIR}"/${PN}-zlib.patch
-)
-DOCS=( CHANGELOG CONTRIBUTE README.md )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		DLOPEN_OPENAL=no \
-		WITH_CDA=no \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_ZIP=yes \
-		WITH_OGG=$(usex ogg) \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/
@ 2018-03-04 11:38 Michał Górny
  0 siblings, 0 replies; 7+ messages in thread
From: Michał Górny @ 2018-03-04 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f405aa6406f2d58f628fcb4cf265fa8e863705e0
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Thu Jan 18 23:33:23 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 11:38:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f405aa64

games-fps/yamagi-quake2: new package

This is the Yamagi Quake II Client, an enhanced version of id Software's
Quake II with focus on offline and coop gameplay. Both the gameplay and
the graphics are unchanged, but many bugs in the last official release
were fixed and some nice to have features like widescreen support and a
modern OpenGL 3.2 renderer were added. Unlike most other Quake II source
ports Yamagi Quake II is fully 64 bit clean and is still actively
maintained.

Closes: https://bugs.gentoo.org/314751

 games-fps/yamagi-quake2/Manifest                   |   4 +
 .../files/yamagi-quake2-addon-respect-flags.patch  |  30 +++++
 .../files/yamagi-quake2-respect-flags.patch        |  40 +++++++
 games-fps/yamagi-quake2/metadata.xml               |  21 ++++
 games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild  | 132 +++++++++++++++++++++
 5 files changed, 227 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
new file mode 100644
index 00000000000..d608a375340
--- /dev/null
+++ b/games-fps/yamagi-quake2/Manifest
@@ -0,0 +1,4 @@
+DIST quake2-7.10.tar.xz 1792748 BLAKE2B 853d6db1eec46ce40952fd413a259653275081599a940941fc883921b310f436be62b80a1d911a0d8f95a33e540e60bd6db2377370cc443cbaa9c3eec6ae055f SHA512 46247c3e2c8e6dcb056dfc7785dd63bf4f896719894a1c5467f2eb313cc3d8a892fda9bafc2ca760a9ac96f6b8e23485a8740b03e118cf9a524f68657183fbb9
+DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
+DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
+DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
new file mode 100644
index 00000000000..d767f04d4b0
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile	2017-05-25 12:45:51.000000000 +0300
++++ b/Makefile	2018-01-14 17:38:34.540167879 +0300
+@@ -64,11 +64,11 @@
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch i386 -arch x86_64
+ else
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -MMD -fwrapv
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -80,9 +80,9 @@
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch i386 -arch x86_64 
++LDFLAGS += -shared -arch i386 -arch x86_64 
+ else
+-LDFLAGS := -shared
++LDFLAGS += -shared
+ endif
+ 
+ # ----------

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch
new file mode 100644
index 00000000000..76ac4b60f50
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch
@@ -0,0 +1,40 @@
+--- a/Makefile	2017-12-08 12:22:59.000000000 +0300
++++ b/Makefile	2018-01-14 15:42:56.804047742 +0300
+@@ -165,12 +165,12 @@
+ # -MMD to generate header dependencies. (They cannot be
+ #  generated if building universal binaries on OSX)
+ ifeq ($(YQ2_OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv
+ CFLAGS += $(OSX_ARCH)
+ else
+-CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \
+-		  -Wall -pipe -g -ggdb -MMD -fwrapv
++CFLAGS += -std=gnu99 -fno-strict-aliasing \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -263,15 +263,15 @@
+ 
+ # Base LDFLAGS.
+ ifeq ($(YQ2_OSTYPE),Linux)
+-LDFLAGS := -L/usr/lib -lm -ldl -rdynamic
++LDFLAGS += -lm -ldl -rdynamic
+ else ifeq ($(YQ2_OSTYPE),FreeBSD)
+-LDFLAGS := -L/usr/local/lib -lm
++LDFLAGS += -lm
+ else ifeq ($(YQ2_OSTYPE),OpenBSD)
+-LDFLAGS := -L/usr/local/lib -lm
++LDFLAGS += -lm
+ else ifeq ($(YQ2_OSTYPE),Windows)
+-LDFLAGS := -L/usr/lib -lws2_32 -lwinmm -static-libgcc
++LDFLAGS += -lws2_32 -lwinmm -static-libgcc
+ else ifeq ($(YQ2_OSTYPE), Darwin)
+-LDFLAGS := $(OSX_ARCH) -lm
++LDFLAGS += $(OSX_ARCH) -lm
+ endif
+ 
+ CFLAGS += -fvisibility=hidden

diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
new file mode 100644
index 00000000000..c573477de06
--- /dev/null
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexander@tsoy.me</email>
+		<name>Alexander Tsoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">yquake2/yquake2</remote-id>
+	</upstream>
+	<use>
+		<flag name="client">Build client</flag>
+		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
+		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
+		<flag name="xatrix">Build support for the 'The Reckoning' Mission Pack</flag>
+	</use>
+</pkgmetadata>

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
new file mode 100644
index 00000000000..09f38aad41c
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils
+
+CTF_V=1.05
+ROGUE_V=2.04
+XATRIX_V=2.05
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
+	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
+	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
+	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated ogg openal rogue xatrix"
+REQUIRED_USE="|| ( client dedicated )"
+
+RDEPEND="sys-libs/zlib:0=
+	client? (
+		media-libs/libsdl2[opengl,video]
+		virtual/opengl
+		ogg? (
+			media-libs/libogg
+			media-libs/libvorbis
+		)
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/quake2-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-respect-flags.patch )
+DOCS=( CHANGELOG CONTRIBUTE README.md )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		DLOPEN_OPENAL=no \
+		WITH_CDA=no \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_ZIP=yes \
+		WITH_OGG=$(usex ogg) \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	use client && targets+=( client ref_gl1 ref_gl3 )
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		local addon_name
+		case ${addon} in
+			ctf)    addon_name="CTF" ;;
+			rogue)  addon_name="Ground Zero" ;;
+			xatrix) addon_name="The Reckoning" ;;
+		esac
+
+		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}


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

end of thread, other threads:[~2022-04-26  4:13 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-20  6:52 [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2022-04-26  4:13 Sam James
2020-04-17 15:10 Joonas Niilola
2020-02-24  5:55 Joonas Niilola
2019-06-03 15:54 Stefan Strogin
2019-04-20  6:52 Michał Górny
2018-03-04 11:38 Michał Górny

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