diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /games-fps/yamagi-quake2 | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'games-fps/yamagi-quake2')
-rw-r--r-- | games-fps/yamagi-quake2/Manifest | 9 | ||||
-rw-r--r-- | games-fps/yamagi-quake2/files/yamagi-quake2-7.42-fno-common.patch | 92 | ||||
-rw-r--r-- | games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch | 33 | ||||
-rw-r--r-- | games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild (renamed from games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild) | 26 |
4 files changed, 12 insertions, 148 deletions
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest index 94635a4728f5..c58ca3330b82 100644 --- a/games-fps/yamagi-quake2/Manifest +++ b/games-fps/yamagi-quake2/Manifest @@ -1,16 +1,11 @@ -AUX yamagi-quake2-7.42-fno-common.patch 2725 BLAKE2B 231b4e9ee57e3885c78e1469a7f729e430f03485535b81af315c971d632a6b7d8bd0a28f8c552e69afaa06fc5105f6ae757bfac327e23aa91c3299f8a5136000 SHA512 107a157bba10ad82bae0a767e00dc445c45b2b3acb5123fb81ea9b38ae4ff361dc38d575ba3dcc0960e46ee29fe4f97b6b2d580947e54f056705c8e144f027bb -AUX yamagi-quake2-addon-respect-flags-r2.patch 966 BLAKE2B 08c2259fbbbc45ea41e2472ff544f8a51082069f0c340c548694d26dafc8f7d86418deed928b8150f52115cf23c399f4886c90570185ff78fe7c6a9d5b6c5286 SHA512 4f5d0402f9b3c227363681bdd38cb098795b18589d2a44f3ab5d9682cf58d6315015c22747167298a63f1fcbca00109208894b1c35ac2e6e4dec3900e25e7780 AUX yamagi-quake2-addon-respect-flags-r3.patch 996 BLAKE2B 7d3c6f13b4973db9d63e15de469953699df48668d5bc5d69607f090f6bac57ea4119174f6de3306f1fc8cd2acdbfb90b8808eebfa7af7e4b4b5996d3b2546d93 SHA512 7136ccc0d666ef14f040e7ca19506dd0be5debe21f0eb819c74851e80445187f98ae60f76d8038d2ead40b1ef0f56643f769d6f9e4241e2b175ea11a19a676da AUX yamagi-quake2-addon-respect-flags-r4.patch 901 BLAKE2B 3aea1c44231122cc95e5f17ae3051111a77a688abf1553470725266a7619ee810878362abbf2b99371e023bee7975542a63bf7fe93153fed95a60ac77285a9d3 SHA512 ede9fcc0db375defbfe8e79105ca330d8ed46498f67a858b923f337eef558ac4dc9f54b8d3de895e7269750009f26c1643c4e3c26362c2f2be751005ec42d855 AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3 -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-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b 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 -EBUILD yamagi-quake2-7.42.ebuild 3636 BLAKE2B 50b15d9a17697e8191fd9ead2575162536b9c08f56d098a6e45c41093a9c20804cce9e2f0a09e4a623edb119d675d161c3e4141b07523347592ca4fc3cc6088f SHA512 e9707a7b71e4937d9a717c02005e76e9a10bddad7860983b96df5d3e17ea036196125984f9c2900df71fbc8adf6d8f9779085b9a5c9b77f7810351e7da857443 EBUILD yamagi-quake2-7.43.ebuild 3557 BLAKE2B c2c91c9acb5f74d6b814d14cf32220f0187936bdf8e3c59faacfbe7a9b827a418faf5f32bc795d346ca53ce9add23242ad1d65b8666597cf9c1afd012cc29716 SHA512 8dc27738707ce59720a9685d926ed92df1995c772264a45c3bc5de2b6057253a992e3b3aa4e01a7baec792662e1f3fd8be7ef702c7c9c719cc7dee380e0b0d7b +EBUILD yamagi-quake2-7.45.ebuild 3505 BLAKE2B ee81e8ec438825670f846c562713c95b7e93a1e77ac88dae61e25bad137376a3076a5dee28435ee03989eb41a40e534d847e68b809610bb2bdd7fe2a3e1c4963 SHA512 5f7391f6fc29d61b819400e9391f54788e9f457cf6d3ecb5bf6120601e615e1edcfd5e78046f50da1e0b2eb052a3b80d59b83d174bd52dabd7af4344500e705e MISC metadata.xml 902 BLAKE2B 5431861cde41e065d91af512cbac3e1f41c8c28dc253d54124eef822a38a021be9e9fd6b000bf6571ae242fc87009ea2a4c5045a568adaa37a99302eb1fe8e7f SHA512 7303da58e949237b5d1c6a6fe83c597c4e5dd955ce07368876ee03114cb124cedc44c8d4c51bb4e530c3194ed7041c694167a4495a698fb3b8a6beaf4b8b6f77 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 6dc8794b874a..000000000000 --- 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 bb800aeaf3c9..000000000000 --- 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.45.ebuild index 052af9137a45..de8310ba1bfe 100644 --- a/games-fps/yamagi-quake2/yamagi-quake2-7.42.ebuild +++ b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild @@ -3,11 +3,11 @@ EAPI=7 -inherit desktop eutils +inherit desktop wrapper -CTF_V="1.06" -ROGUE_V="2.06" -XATRIX_V="2.07" +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/" @@ -15,17 +15,18 @@ 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" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix" REQUIRED_USE=" || ( client dedicated ) client? ( || ( opengl softrender ) ) " -COMMON_DEPEND=" +DEPEND=" client? ( media-libs/libsdl2[video] !openal? ( media-libs/libsdl2[sound] ) @@ -35,18 +36,11 @@ COMMON_DEPEND=" ) ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${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/. ) +DOCS=( CHANGELOG README.md doc ) mymake() { emake \ @@ -64,7 +58,7 @@ src_prepare() { pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die if [[ ${addon} = ctf ]]; then - eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch + eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r4.patch else eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r3.patch fi |