[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/
commit: 7f3f4b56a08fd671b02ea6ffc3062d416b665ad7 Author: Florian Schmaus gentoo org> AuthorDate: Tue Mar 29 13:05:12 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Mar 29 13:07:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3f4b56 games-fps/urbanterror: add 4.3.4_p20211208 Closes: https://github.com/gentoo/gentoo/pull/24768 Signed-off-by: Florian Schmaus gentoo.org> games-fps/urbanterror/Manifest | 1 + ...urbanterror-4.3.4_p20211208-respect-flags.patch | 79 ++ .../urbanterror/urbanterror-4.3.4_p20211208.ebuild | 172 + 3 files changed, 252 insertions(+) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index d0d24bf966d5..ef2a679e0116 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1 +1,2 @@ DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd SHA512 ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2 +DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d400fa273e64a2e2b57a75661044370 SHA512 24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86 diff --git a/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch b/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch new file mode 100644 index ..d6938f3a4609 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch @@ -0,0 +1,79 @@ +--- a/Makefile b/Makefile +@@ -322,30 +322,30 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu") + -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" + CLIENT_CFLAGS += $(SDL_CFLAGS) + +- OPTIMIZEVM = -O3 +- OPTIMIZE = $(OPTIMIZEVM) -ffast-math ++ OPTIMIZEVM = ++ OPTIMIZE = $(OPTIMIZEVM) + + ifeq ($(ARCH),x86_64) +-OPTIMIZEVM = -O3 +-OPTIMIZE = $(OPTIMIZEVM) -ffast-math ++OPTIMIZEVM = ++OPTIMIZE = $(OPTIMIZEVM) + HAVE_VM_COMPILED = true + else + ifeq ($(ARCH),x86) +-OPTIMIZEVM = -O3 -march=i586 +-OPTIMIZE = $(OPTIMIZEVM) -ffast-math ++OPTIMIZEVM = ++OPTIMIZE = $(OPTIMIZEVM) + HAVE_VM_COMPILED=true + else + ifeq ($(ARCH),ppc) +-ALTIVEC_CFLAGS = -maltivec ++ALTIVEC_CFLAGS = + HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),ppc64) +-ALTIVEC_CFLAGS = -maltivec ++ALTIVEC_CFLAGS = + HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),sparc) +-OPTIMIZE += -mtune=ultrasparc3 -mv8plus +-OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus ++OPTIMIZE += ++OPTIMIZEVM += + HAVE_VM_COMPILED=true + endif + ifeq ($(ARCH),armv7l) +@@ -1153,7 +1153,7 @@ endif + + define DO_CC + $(echo_cmd) "CC $<" +-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< ++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< + endef + + define DO_CC_ALTIVEC +@@ -1163,7 +1163,7 @@ endef + + define DO_REF_CC + $(echo_cmd) "REF_CC $<" +-$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< ++$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< + endef + + define DO_REF_CC_ALTIVEC +@@ -1181,7 +1181,7 @@ endef + + define DO_BOT_CC + $(echo_cmd) "BOT_CC $<" +-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< ++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< + endef + + ifeq ($(GENERATE_DEPENDENCIES),1) +@@ -1195,7 +1195,7 @@ endef + + define DO_DED_CC + $(echo_cmd) "DED_CC $<" +-$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< ++$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< + endef + + define DO_WINDRES diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild new file mode 100644 index ..5a8e0c3737e8 --- /dev/null +++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop flag-o-matic toolchain-funcs xdg-utils + +DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" +HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mickael9/ioq3.git; + EGIT_BRANCH="urt" +else +
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/
commit: a37d71ce2730ce36f465d0d927cd1a7220db61bf Author: Florian Schmaus gentoo org> AuthorDate: Tue Mar 29 13:06:32 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Mar 29 13:07:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37d71ce games-fps/urbanterror: drop 4.3.4_p20210304 Signed-off-by: Florian Schmaus gentoo.org> games-fps/urbanterror/Manifest | 1 - ...anterror-4.3.4_p20180708-fix-build_system.patch | 94 .../urbanterror/urbanterror-4.3.4_p20210304.ebuild | 169 - 3 files changed, 264 deletions(-) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index ef2a679e0116..c979f83b10ba 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,2 +1 @@ -DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd SHA512 ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2 DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d400fa273e64a2e2b57a75661044370 SHA512 24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86 diff --git a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch deleted file mode 100644 index fddd8df5bf37.. --- a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch +++ /dev/null @@ -1,94 +0,0 @@ -Author: Nils Freydank -Date: Fri Nov 17 20:30:00 2017 +0100 - -Respect CFLAGS, CPPFLAGS etc. This patch is inspired -by hasufell’s patch. - -Edit 2018-03-19: Now with server support! -Edit 2018-09-01: Update to take Makefile changes into account. - a/Makefile 2018-07-08 11:00:00.0 +0200 -+++ b/Makefile 2018-09-01 11:00:00.1 +0200 -@@ -308,34 +308,33 @@ - CLIENT_EXTRA_FILES= - - ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ ---pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" -+ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" - CLIENT_CFLAGS += $(SDL_CFLAGS) - -- OPTIMIZEVM = -O3 -- OPTIMIZE = $(OPTIMIZEVM) -ffast-math -+ OPTIMIZEVM = -+ OPTIMIZE = $(OPTIMIZEVM) - - ifeq ($(ARCH),x86_64) --OPTIMIZEVM = -O3 --OPTIMIZE = $(OPTIMIZEVM) -ffast-math -+OPTIMIZEVM = -+OPTIMIZE = $(OPTIMIZEVM) - HAVE_VM_COMPILED = true - else - ifeq ($(ARCH),x86) --OPTIMIZEVM = -O3 -march=i586 --OPTIMIZE = $(OPTIMIZEVM) -ffast-math -+OPTIMIZEVM = -+OPTIMIZE = $(OPTIMIZEVM) - HAVE_VM_COMPILED=true - else - ifeq ($(ARCH),ppc) --ALTIVEC_CFLAGS = -maltivec -+ALTIVEC_CFLAGS = - HAVE_VM_COMPILED=true - endif - ifeq ($(ARCH),ppc64) --ALTIVEC_CFLAGS = -maltivec -+ALTIVEC_CFLAGS = - HAVE_VM_COMPILED=true - endif - ifeq ($(ARCH),sparc) --OPTIMIZE += -mtune=ultrasparc3 -mv8plus --OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus -+OPTIMIZE += -+OPTIMIZEVM += - HAVE_VM_COMPILED=true - endif - ifeq ($(ARCH),armv7l) -@@ -1143,7 +1142,7 @@ - - define DO_CC - $(echo_cmd) "CC $<" --$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< -+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< - endef - - define DO_CC_ALTIVEC -@@ -1153,7 +1152,7 @@ - - define DO_REF_CC - $(echo_cmd) "REF_CC $<" --$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< -+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< - endef - - define DO_REF_CC_ALTIVEC -@@ -1171,7 +1170,7 @@ - - define DO_BOT_CC - $(echo_cmd) "BOT_CC $<" --$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< -+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< - endef - - ifeq ($(GENERATE_DEPENDENCIES),1) -@@ -1185,7 +1184,7 @@ - - define DO_DED_CC - $(echo_cmd) "DED_CC $<" --$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< -+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< - endef - - define DO_WINDRES - diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild deleted file mode 100644 index 79cdded4b1d5.. --- a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/
commit: a7e603f66b80181f742b5fda476c185753ae1ce6 Author: Nils Freydank posteo de> AuthorDate: Wed Mar 14 21:43:18 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 15 22:27:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e603f6 games-fps/urbanterror: Bump to 4.3.3_p20180218 Note that the engine's code is still the same. Package-Manager: Portage-2.3.24, Repoman-2.3.6 games-fps/urbanterror/Manifest | 1 + .../urbanterror-4.3.3_p20180218-fix-loop.patch | 59 .../urbanterror/urbanterror-4.3.3_p20180218.ebuild | 167 + 3 files changed, 227 insertions(+) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index 2534ae6fbba..2fd75ae2d2b 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,2 +1,3 @@ DIST urbanterror-4.3.2_p20180216.tar.gz 10070633 BLAKE2B 38724030fc87e0800b9d6d1814efafc244584832e9fe78df060f2603040d72ee38602e300c3c765dfab4f803c9ae0e63116daf01601e571357a914509a6a8672 SHA512 88aa12a492f1d94e956ab4a8a1caeec259081043706b160d87fffe91b502399c0ddc34a4566463f336ae1b133cf250920ccd718647ac13d2eb48ddf9e6bb5517 DIST urbanterror-4.3.2_p20180218.tar.gz 10069644 BLAKE2B ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624 SHA512 e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8 +DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624 SHA512 e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8 diff --git a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch new file mode 100644 index 000..c34ebe84ced --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch @@ -0,0 +1,59 @@ +Author: Nils Freydank+Date: Wed Mar 14 21:00:00 2017 +0100 + +Imported patch written by Tom Murphy via github.com: + +https://github.com/ioquake/ioq3/pull/356 + +diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c +index 2c2b595cf..58f178ade 100644 +--- a/code/sys/con_tty.c b/code/sys/con_tty.c +@@ -73,20 +73,6 @@ static int hist_current = -1, hist_count = 0; + #define TTY_CONSOLE_PROMPT "]" + #endif + +-/* +-== +-CON_FlushIn +- +-Flush stdin, I suspect some terminals are sending a LOT of shit +-FIXME relevant? +-== +-*/ +-static void CON_FlushIn( void ) +-{ +- char key; +- while (read(STDIN_FILENO, , 1)!=-1); +-} +- + /* + == + CON_Back +@@ -441,7 +427,7 @@ char *CON_Input( void ) + TTY_con = *history; + CON_Show(); + } +- CON_FlushIn(); ++ tcflush(STDIN_FILENO, TCIFLUSH); + return NULL; + break; + case 'B': +@@ -455,7 +441,7 @@ char *CON_Input( void ) + Field_Clear(_con); + } + CON_Show(); +- CON_FlushIn(); ++ tcflush(STDIN_FILENO, TCIFLUSH); + return NULL; + break; + case 'C': +@@ -467,7 +453,7 @@ char *CON_Input( void ) + } + } + Com_DPrintf("droping ISCTL sequence: %d, TTY_erase: %d\n", key, TTY_erase); +- CON_FlushIn(); ++ tcflush(STDIN_FILENO, TCIFLUSH); + return NULL; + } + if (TTY_con.cursor >= sizeof(text) - 1) diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/
commit: 427bb38ba9b9980affd2ec8d07553062334b3614 Author: Michael Sterrett gentoo org> AuthorDate: Sat Apr 2 18:52:04 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Sat Apr 2 18:52:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427bb38b games-fps/urbanterror: fix building when USE=-curl is specified (bug #572074) Package-Manager: portage-2.2.26 .../urbanterror/files/urbanterror-4.2.023-nocurl.patch | 16 games-fps/urbanterror/urbanterror-4.2.023.ebuild | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch new file mode 100644 index 000..b7d1f31 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch @@ -0,0 +1,16 @@ +fix building when USE=-curl is specified (bug #572074) + +--- ./code/client/cl_main.c.orig ./code/client/cl_main.c +@@ -1872,7 +1872,11 @@ + } + + qboolean CL_IsDownloading(void) { ++#if USE_CURL + return clc.cURLUsed; ++#else ++ return qfalse; ++#endif + } + + /* diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild index a28e710..6065053 100644 --- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild +++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild @@ -81,7 +81,9 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch + epatch \ + "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch \ + "${FILESDIR}"/${PN}-${ENGINE_PV}-nocurl.patch } src_compile() {