* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/files/, games-fps/yamagi-quake2/
@ 2018-04-11 21:47 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2018-04-11 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 547b426dc4c4f660a9262ad4a2fa21a2f55f247f
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Apr 9 23:06:54 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 21:47:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547b426d
games-fps/yamagi-quake2: version bump to 7.20.
Closes: https://github.com/gentoo/gentoo/pull/7921
games-fps/yamagi-quake2/Manifest | 1 +
.../yamagi-quake2/files/yamagi-quake2-zlib.patch | 17 +++
games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild | 146 +++++++++++++++++++++
3 files changed, 164 insertions(+)
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index d608a375340..cb700cafbe4 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,5 @@
DIST quake2-7.10.tar.xz 1792748 BLAKE2B 853d6db1eec46ce40952fd413a259653275081599a940941fc883921b310f436be62b80a1d911a0d8f95a33e540e60bd6db2377370cc443cbaa9c3eec6ae055f SHA512 46247c3e2c8e6dcb056dfc7785dd63bf4f896719894a1c5467f2eb313cc3d8a892fda9bafc2ca760a9ac96f6b8e23485a8740b03e118cf9a524f68657183fbb9
+DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
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-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
new file mode 100644
index 00000000000..1de79c98690
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
@@ -0,0 +1,17 @@
+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.20.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
new file mode 100644
index 00000000000..779346e191f
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
@@ -0,0 +1,146 @@
+# 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
+ "${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 )
+ 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
+}
+
+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] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/files/, games-fps/yamagi-quake2/
@ 2020-10-28 7:51 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-10-28 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 636b887dc54659a941c55b89474bdcac0ba36f0e
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Oct 24 23:14:27 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 07:51:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636b887d
games-fps/yamagi-quake2: Drop old 7.42
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/18026
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
games-fps/yamagi-quake2/Manifest | 4 -
.../files/yamagi-quake2-7.42-fno-common.patch | 92 ------------
.../yamagi-quake2-addon-respect-flags-r2.patch | 33 -----
games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild | 155 ---------------------
4 files changed, 284 deletions(-)
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 1dea6a99fb5..1f6bc68feb9 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,9 +1,5 @@
-DIST quake2-7.42.tar.xz 1987332 BLAKE2B 63ced75746eb031faf949c6b094ec607076f481b8d97eca242f9bf6fd6325afc8dfb5f98fe4f8ba5c5e87b721392f613031fc204b775634fc5292a26fef1d76c SHA512 0f51204fcf14ecb3f1f654e6ee19207836cf4642022569ef202bc12f312f76dbd43695aa4d9f9fb70c8b023f42d1a8fcec25f472a32175ebb0a308211fa40cc0
DIST quake2-7.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
-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.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6
DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
-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-7.42-fno-common.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch
deleted file mode 100644
index 6dc8794b874..00000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-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-r2.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
deleted file mode 100644
index bb800aeaf3c..00000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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.42.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild
deleted file mode 100644
index 052af9137a4..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/files/, games-fps/yamagi-quake2/
@ 2021-12-28 17:10 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-12-28 17:10 UTC (permalink / raw
To: gentoo-commits
commit: e4a69761aabbc202eece0b94c37272e612663a41
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 15:00:43 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 17:00:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a69761
games-fps/yamagi-quake2: drop 7.45
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-fps/yamagi-quake2/Manifest | 4 -
.../yamagi-quake2-addon-respect-flags-r3.patch | 33 -----
.../yamagi-quake2-addon-respect-flags-r4.patch | 33 -----
games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild | 149 ---------------------
4 files changed, 219 deletions(-)
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 95c071326948..adc6933fda86 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,9 +1,5 @@
-DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
DIST quake2-8.00.tar.xz 2086776 BLAKE2B 6a525b0d3703e17ca6ff85cbef7cf0c0522308fb71f8db4649e7bfbe3326c610d878d6a4af36ed6a578c700c5e1d004be7c0a9dd86cb495a27c8deb8b761eab9 SHA512 886c0df687e7e64a534f6e6f0b212084212d4d5c1278d2567b25bdd48df9ffab9ce75894ab6cfc2fd3a070adf9c1e3d7bb2e823d4f5aef8ef2cbc21c21c063bd
-DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
-DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
-DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c
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
deleted file mode 100644
index c7cf611ab96d..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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/files/yamagi-quake2-addon-respect-flags-r4.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch
deleted file mode 100644
index 86c794b99e5e..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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.45.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
deleted file mode 100644
index de8310ba1bfe..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop wrapper
-
-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 ~arm64 ~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 ) )
-"
-
-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] 3+ messages in thread
end of thread, other threads:[~2021-12-28 17:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-28 7:51 [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/files/, games-fps/yamagi-quake2/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-12-28 17:10 Ionen Wolkens
2018-04-11 21:47 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox