summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Freydank <holgersson@posteo.de>2018-10-08 13:37:22 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-10-12 02:56:45 +0200
commit90634c11e58fb05e344b8259225cea15fd6ff75f (patch)
treea2386ffbd8ad2e4850e0f39e6b0595a83472cdb7 /games-fps/urbanterror/files
parentgames-fps/urbanterror: Bump to 4.3.4_p20180708 (diff)
downloadgentoo-90634c11e58fb05e344b8259225cea15fd6ff75f.tar.gz
gentoo-90634c11e58fb05e344b8259225cea15fd6ff75f.tar.bz2
gentoo-90634c11e58fb05e344b8259225cea15fd6ff75f.zip
games-fps/urbanterror: Cleanup old files
Signed-off-by: Nils Freydank <holgersson@posteo.de> Package-Manager: Portage-2.3.50, Repoman-2.3.11 Closes: https://github.com/gentoo/gentoo/pull/10103 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'games-fps/urbanterror/files')
-rw-r--r--games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch99
-rw-r--r--games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch59
2 files changed, 0 insertions, 158 deletions
diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
deleted file mode 100644
index e0c4eb27f539..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Nils Freydank <holgersson@posteo.de>
-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!
-
---- a/Makefile 2018-03-19 11:00:00.000000000 +0100
-+++ b/Makefile 2018-03-19 11:00:00.000000001 +0100
-@@ -223,7 +223,7 @@
- ifndef USE_ALTGAMMA
- # Clearskies - X11-based gamma for Linux
- USE_ALTGAMMA=1
--endif
-+ endif
-
- ifndef USE_SKEETMOD
- USE_SKEETMOD=0
-@@ -306,34 +306,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)
-- BASE_CFLAGS += -maltivec
-+ BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),ppc64)
-- BASE_CFLAGS += -maltivec
-+ BASE_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)
-@@ -1130,12 +1129,12 @@
-
- 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_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_STR
-@@ -1148,7 +1147,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)
-@@ -1162,7 +1161,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/files/urbanterror-4.3.3_p20180218-fix-loop.patch b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
deleted file mode 100644
index c34ebe84cedf..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Nils Freydank <holgersson@posteo.de>
-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, &key, 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(&TTY_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)