[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
commit: cf5d7766d3f092350296317c00558a035acc7246 Author: Nils Freydank posteo de> AuthorDate: Mon Oct 8 10:58:03 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Oct 12 00:56:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5d7766 games-fps/urbanterror: Bump to 4.3.4_p20180708 Signed-off-by: Nils Freydank posteo.de> Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Thomas Deutschmann gentoo.org> games-fps/urbanterror/Manifest | 1 + ...anterror-4.3.4_p20180708-fix-build_system.patch | 94 .../urbanterror/urbanterror-4.3.4_p20180708.ebuild | 169 + 3 files changed, 264 insertions(+) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index d52c2c83a4b..d5f6b196cf1 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1 +1,2 @@ DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef +DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227 SHA512 97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58 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 new file mode 100644 index 000..fddd8df5bf3 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch @@ -0,0 +1,94 @@ +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_p20180708.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild new file mode 100644 index 000..2eed0405afc --- /dev/null +++
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
commit: 90634c11e58fb05e344b8259225cea15fd6ff75f Author: Nils Freydank posteo de> AuthorDate: Mon Oct 8 11:37:22 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Oct 12 00:56:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90634c11 games-fps/urbanterror: Cleanup old files Signed-off-by: Nils Freydank 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 gentoo.org> games-fps/urbanterror/Manifest | 1 - .../files/urbanterror-4.3-fix-build_system.patch | 99 .../urbanterror-4.3.3_p20180218-fix-loop.patch | 59 --- .../urbanterror/urbanterror-4.3.4_p20180627.ebuild | 170 - 4 files changed, 329 deletions(-) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index d5f6b196cf1..2fe3e1ecd71 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,2 +1 @@ -DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227 SHA512 97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58 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 e0c4eb27f53..000 --- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch +++ /dev/null @@ -1,99 +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! - a/Makefile 2018-03-19 11:00:00.0 +0100 -+++ b/Makefile 2018-03-19 11:00:00.1 +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
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/
commit: d26453b62aa943abea979a8804dbcd0cfd54b4fb Author: Nils Freydank posteo de> AuthorDate: Mon Mar 19 11:20:44 2018 + Commit: Michał Górny gentoo org> CommitDate: Mon Mar 19 16:52:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26453b6 games-fps/urbanterror: Fix Makefile patch. Closes: https://bugs.gentoo.org/650232 Closes: https://github.com/gentoo/gentoo/pull/7506 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/urbanterror-4.3-fix-build_system.patch | 32 -- 1 file changed, 29 insertions(+), 3 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 index b7a24a1b6e9..e0c4eb27f53 100644 --- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch +++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch @@ -4,8 +4,10 @@ Date: Fri Nov 17 20:30:00 2017 +0100 Respect CFLAGS, CPPFLAGS etc. This patch is inspired by hasufell’s patch. a/Makefile 2017-03-31 11:08:58.419210817 +0200 -+++ b/Makefile 2017-11-17 20:30:00.0 +0100 +Edit 2018-03-19: Now with server support! + +--- a/Makefile 2018-03-19 11:00:00.0 +0100 b/Makefile 2018-03-19 11:00:00.1 +0100 @@ -223,7 +223,7 @@ ifndef USE_ALTGAMMA # Clearskies - X11-based gamma for Linux @@ -61,7 +63,7 @@ by hasufell’s patch. HAVE_VM_COMPILED=true endif ifeq ($(ARCH),armv7l) -@@ -1124,7 +1123,7 @@ +@@ -1130,12 +1129,12 @@ define DO_CC $(echo_cmd) "CC $<" @@ -70,4 +72,28 @@ by hasufell’s patch. 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
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
commit: 621814eb0f86ad1cecd86f730b48f8db23089a63 Author: Nils Freydank posteo de> AuthorDate: Sat Dec 9 10:54:14 2017 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Dec 10 20:40:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621814eb games-fps/urbanterror: Cleanup old versions. Package-Manager: Portage-2.3.17, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6488 games-fps/urbanterror/Manifest | 5 - .../files/urbanterror-4.3-respect_CFLAGS.patch | 53 --- .../urbanterror/urbanterror-4.3.2_p20170426.ebuild | 152 --- .../urbanterror/urbanterror-4.3.2_p20170713.ebuild | 152 --- .../urbanterror/urbanterror-4.3.2_p20170915.ebuild | 152 --- .../urbanterror/urbanterror-4.3.2_p20171016.ebuild | 148 --- .../urbanterror/urbanterror-4.3.2_p20171105.ebuild | 163 - 7 files changed, 825 deletions(-) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index e6931427297..f49cff1d924 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,6 +1 @@ -DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 BLAKE2B 7ce3f2abd00a71194160fcde4185733f1232a232237fb50d8d59ee188b2c40d117cdb3b3a03e0f0f6a9456ccf7e7dea030a96de438fcaa408ea6ff52cd23892c SHA512 e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3 -DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 BLAKE2B 4771e5ecf997334d33ae4b2040e6a2c9e7e2e85990152efef14f071db656e2712fed078dd117c9701ffd1be2e36360cee3d1c7126e10706a12013f5cc8a9625d SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4 -DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 BLAKE2B 9e42de663b1ae0ae9e16a279233c88eb419f424c3db0b4d14276cbb9ab59fba3f32b43593f5901e0a6299ef8c2e4fe1d39a789d107a7bd9c15422a3acf553cea SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e -DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 BLAKE2B 12cc4cd40f85c8d15c93fbafa5cc0c5fe2b8c2d35962aa6a24e8878525b262bab47a5f8cfef6e7a4e4d506c47a5d56fb22db99e341efac06cd1b16e1d845027b SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea -DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 BLAKE2B e843623976ad1d2379121bb834eabac634d57185c0b15ee298cf900474a7879ba0d2f45e1e6eb002d963fa83d895f8962110dc7f5dc5a209cde1aee3a9a8234a SHA512 7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 9934317fb649e652628639f9ea35cdaa0466363b52ea73251986360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91 SHA512 1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a diff --git a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch deleted file mode 100644 index 5ce13342ab5..000 --- a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch +++ /dev/null @@ -1,53 +0,0 @@ -Author: holgersson-Date: Fri Mar 31 12:13:00 2017 +0200 - -Respect CFLAGS - inspired by hasufell’s patch - a/Makefile 2017-03-31 11:08:58.419210817 +0200 -+++ b/Makefile 2017-03-31 12:06:52.559412054 +0200 -@@ -290,34 +290,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) diff --git
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
commit: f32bcdeee1d31d80e0a62facb25a6839f7f60b51 Author: Nils Freydank posteo de> AuthorDate: Fri Nov 17 20:39:33 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 19 18:32:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32bcdee games-fps/urbanterror: Bump to 4.3.2_p20171105. This bump adds support for skeetshoot mod. For more details, see: https://github.com/mickael9/ioq3/pull/13 and upstream commit 31e6b45a323f8ded92a1b4b78530ea0bc5382b85. According to the effort to reorganise X related calls[1], and as the icon isn't shipped anymore, only xdg_desktop_database_update is called. This bump also fixes a wrong compiler call (cc instead of correct gcc-call). [1] https://wiki.gentoo.org/wiki/Notes_on_ebuilds_with_GUI Package-Manager: Portage-2.3.14, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6156 games-fps/urbanterror/Manifest | 1 + .../files/urbanterror-4.3-fix-build_system.patch | 73 + games-fps/urbanterror/metadata.xml | 5 +- .../urbanterror/urbanterror-4.3.2_p20171105.ebuild | 163 + 4 files changed, 240 insertions(+), 2 deletions(-) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index f6cf1e0db7a..680a143fd69 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -2,3 +2,4 @@ DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 8009516332e1f77eae3681b4 DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4 WHIRLPOOL 2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290 DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e WHIRLPOOL 912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 SHA256 a345cae14ce1f445ef1ed9d883f4f06e0365fdfa05c50d2f34bfcdb89744e405 SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea WHIRLPOOL d4a519b1c9a7e63a98e9901c815e73f1c467412f6ad6757dafd6c4afb013bd9c3d4da3155cdc91c728113078e466d39fa68c1bb404e8019ad75984bf683370ff +DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 SHA256 5b577d3c5ac62cbece532c54a3e30b2c89b9accb60657475a7cd2fb768f0bb02 SHA512 7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad WHIRLPOOL 680a170e50d2d398129e1c0788ffa622fb4795d810e01db216232a16e6d8024813d648bf2276a7cb1bf14187d8c32794b0bb48c83d854d5c9989be1bc716560b 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 new file mode 100644 index 000..b7a24a1b6e9 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch @@ -0,0 +1,73 @@ +Author: Nils Freydank+Date: Fri Nov 17 20:30:00 2017 +0100 + +Respect CFLAGS, CPPFLAGS etc. This patch is inspired +by hasufell’s patch. + +--- a/Makefile 2017-03-31 11:08:58.419210817 +0200 b/Makefile 2017-11-17 20:30:00.0 +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 +-
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/
commit: fb783bc49c404ec6cc0405f872126b6bc2e78e31 Author: Nils Freydank posteo de> AuthorDate: Sun Jul 16 20:58:37 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jul 16 21:02:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb783bc4 games-fps/urbanterror: Cleanup old unused patches Signed-off-by: Thomas Deutschmann gentoo.org> Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../files/urbanterror-4.2.023-build.patch | 75 -- .../files/urbanterror-4.2.023-nocurl.patch | 16 - 2 files changed, 91 deletions(-) diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch deleted file mode 100644 index daa7e324a67..000 --- a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch +++ /dev/null @@ -1,75 +0,0 @@ -Author: hasufell-Date: Wed Jul 10 01:25:27 2013 +0200 - -respect CFLAGS/LDFLAGS - a/Makefile -+++ b/Makefile -@@ -213,7 +213,7 @@ - endif - endif - -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe -+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL=1 -@@ -239,19 +239,15 @@ - BASE_CFLAGS += -I/usr/X11R6/include - endif - -- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer -+ OPTIMIZE = - - ifeq ($(ARCH),x86_64) --OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ -- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -- -fstrength-reduce -+OPTIMIZE = - # experimental x86_64 jit compiler! you need GNU as - HAVE_VM_COMPILED = true - else - ifeq ($(ARCH),i386) --OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ -- -funroll-loops -falign-loops=2 -falign-jumps=2 \ -- -falign-functions=2 -fstrength-reduce -+OPTIMIZE = - HAVE_VM_COMPILED=true - else - ifeq ($(ARCH),ppc) -@@ -265,7 +261,7 @@ - BASE_CFLAGS += -DNO_VM_COMPILED - endif - -- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) - - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - -@@ -274,7 +270,7 @@ - SHLIBLDFLAGS=-shared $(LDFLAGS) - - THREAD_LDFLAGS=-lpthread -- LDFLAGS=-ldl -lm -+ LDFLAGS+=-ldl -lm - - ifeq ($(USE_SDL),1) - CLIENT_LDFLAGS=$(shell sdl-config --libs) -@@ -1158,13 +1154,13 @@ - - $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ -- $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ -+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) - - $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ -- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ -+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) - - ifneq ($(strip $(LIBSDLMAIN)),) - ifneq ($(strip $(LIBSDLMAINSRC)),) diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch deleted file mode 100644 index b7d1f310642..000 --- a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 - } - - /*
[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
commit: fccde5cf308d9d08016e70873ca8ca041c94b7e7 Author: Nils Freydank posteo de> AuthorDate: Wed May 10 19:55:21 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed May 10 19:55:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fccde5cf games-fps/urbanterror: Bump to v4.3.2_p20170426 (bug #596982) EBuild changes: === - Ebuild no longer uses bundled libs (bug #457014) - Contains fixes for / no longer affected by CVE-2011-1412, CVE-2011-2764, CVE-2011-3012,CVE-2012-3345 due to updated/changed engine (bug #606702) - Fixed some format-security problems (bug #545966) Closes: https://github.com/gentoo/gentoo/pull/4172 Gentoo-Bug: https://bugs.gentoo.org/596982 Gentoo-Bug: https://bugs.gentoo.org/457014 Gentoo-Bug: https://bugs.gentoo.org/545966 Gentoo-Bug: https://bugs.gentoo.org/606702 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Signed-off-by: Thomas Deutschmann gentoo.org> games-fps/urbanterror/Manifest | 1 + .../files/urbanterror-4.3-respect_CFLAGS.patch | 53 +++ games-fps/urbanterror/metadata.xml | 17 ++- .../urbanterror/urbanterror-4.3.2_p20170426.ebuild | 152 + 4 files changed, 220 insertions(+), 3 deletions(-) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index 17d6aa25356..5ff4b23affe 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,4 +1,5 @@ DIST UrbanTerror-4.2.022-to-4.2.023.zip 15296685 SHA256 71d34f4245c264dd729d40cf76c1471c89606891f88fda28e007ebe6a052dde9 SHA512 2b35a34cf478939b850fd6f9b2f4a46f55259f32574799968ec4595c8e7c8930910ac6958bf03c99d63516cc4a41dbd6faaad4207326e42a19981561d25aff0e WHIRLPOOL bc13ec862ad829a5b417b114d50cc3f3dc1701b3c6fd136bafa0e2a68f0bbe44d03ea33a832e4882ab7cf63f3202b1ff6f62660bc69273542165d8e7f1e36d2f DIST UrbanTerror42_full022.zip 1924134151 SHA256 e8b0a2c3a7253c24cac4e5b24028a0c9841717ae867e74ae18a18fd9c7259fd6 SHA512 6da90696c8e0f2b5315bc2564e45e8d4ee708f5f42dc1ae26846a030798c1614ef938e0ed2028ceb69b7f5a59aa1a2310d73a20530f52be29e7c4e5819f6b290 WHIRLPOOL 9e428099bdfdad94cb554821dfd9128cd909c9c51c50b2009b8778aea69bb4be10be0c6a9299de76e60c9d5a22eb0dc06a1987f4851d360c718ed6f019554a36 DIST urbanterror-4.2.023.tar.gz 12637911 SHA256 17c79f4ed1adc0859a20f0b19ab75f04e1e7ff518c882b5cd68199b44acff90f SHA512 c0b3fb0d53889561124ea034bd2b579c3b56489e751adf9479b86c54855b4f0917589a41caa7c1a534afee59983f77394a1c76dc92534dc84116a5566c19e8e5 WHIRLPOOL 68fa26a7a0ea19a1b7b3ced968515e1b326a9f7acabc30096b15880a772c4ca4faa764fb1fd4ab07d616718c550284af88cd03deeb8b11b7003b96336413d3ee +DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3 WHIRLPOOL 6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824 DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c diff --git a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch new file mode 100644 index 000..5ce13342ab5 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch @@ -0,0 +1,53 @@ +Author: holgersson+Date: Fri Mar 31 12:13:00 2017 +0200 + +Respect CFLAGS - inspired by hasufell’s patch + +--- a/Makefile 2017-03-31 11:08:58.419210817 +0200 b/Makefile 2017-03-31 12:06:52.559412054 +0200 +@@ -290,34 +290,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) +-