1 |
commit: a37d71ce2730ce36f465d0d927cd1a7220db61bf |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 29 13:06:32 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 29 13:07:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37d71ce |
7 |
|
8 |
games-fps/urbanterror: drop 4.3.4_p20210304 |
9 |
|
10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
11 |
|
12 |
games-fps/urbanterror/Manifest | 1 - |
13 |
...anterror-4.3.4_p20180708-fix-build_system.patch | 94 ------------ |
14 |
.../urbanterror/urbanterror-4.3.4_p20210304.ebuild | 169 --------------------- |
15 |
3 files changed, 264 deletions(-) |
16 |
|
17 |
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest |
18 |
index ef2a679e0116..c979f83b10ba 100644 |
19 |
--- a/games-fps/urbanterror/Manifest |
20 |
+++ b/games-fps/urbanterror/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd SHA512 ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2 |
23 |
DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d4005555fa273e64a2e2b57a75661044370 SHA512 24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86 |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index fddd8df5bf37..000000000000 |
28 |
--- a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch |
29 |
+++ /dev/null |
30 |
@@ -1,94 +0,0 @@ |
31 |
-Author: Nils Freydank <holgersson@××××××.de> |
32 |
-Date: Fri Nov 17 20:30:00 2017 +0100 |
33 |
- |
34 |
-Respect CFLAGS, CPPFLAGS etc. This patch is inspired |
35 |
-by hasufell’s patch. |
36 |
- |
37 |
-Edit 2018-03-19: Now with server support! |
38 |
-Edit 2018-09-01: Update to take Makefile changes into account. |
39 |
- |
40 |
---- a/Makefile 2018-07-08 11:00:00.000000000 +0200 |
41 |
-+++ b/Makefile 2018-09-01 11:00:00.000000001 +0200 |
42 |
-@@ -308,34 +308,33 @@ |
43 |
- CLIENT_EXTRA_FILES= |
44 |
- |
45 |
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) |
46 |
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ |
47 |
-- -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" |
48 |
-+ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" |
49 |
- CLIENT_CFLAGS += $(SDL_CFLAGS) |
50 |
- |
51 |
-- OPTIMIZEVM = -O3 |
52 |
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math |
53 |
-+ OPTIMIZEVM = |
54 |
-+ OPTIMIZE = $(OPTIMIZEVM) |
55 |
- |
56 |
- ifeq ($(ARCH),x86_64) |
57 |
-- OPTIMIZEVM = -O3 |
58 |
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math |
59 |
-+ OPTIMIZEVM = |
60 |
-+ OPTIMIZE = $(OPTIMIZEVM) |
61 |
- HAVE_VM_COMPILED = true |
62 |
- else |
63 |
- ifeq ($(ARCH),x86) |
64 |
-- OPTIMIZEVM = -O3 -march=i586 |
65 |
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math |
66 |
-+ OPTIMIZEVM = |
67 |
-+ OPTIMIZE = $(OPTIMIZEVM) |
68 |
- HAVE_VM_COMPILED=true |
69 |
- else |
70 |
- ifeq ($(ARCH),ppc) |
71 |
-- ALTIVEC_CFLAGS = -maltivec |
72 |
-+ ALTIVEC_CFLAGS = |
73 |
- HAVE_VM_COMPILED=true |
74 |
- endif |
75 |
- ifeq ($(ARCH),ppc64) |
76 |
-- ALTIVEC_CFLAGS = -maltivec |
77 |
-+ ALTIVEC_CFLAGS = |
78 |
- HAVE_VM_COMPILED=true |
79 |
- endif |
80 |
- ifeq ($(ARCH),sparc) |
81 |
-- OPTIMIZE += -mtune=ultrasparc3 -mv8plus |
82 |
-- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus |
83 |
-+ OPTIMIZE += |
84 |
-+ OPTIMIZEVM += |
85 |
- HAVE_VM_COMPILED=true |
86 |
- endif |
87 |
- ifeq ($(ARCH),armv7l) |
88 |
-@@ -1143,7 +1142,7 @@ |
89 |
- |
90 |
- define DO_CC |
91 |
- $(echo_cmd) "CC $<" |
92 |
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
93 |
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
94 |
- endef |
95 |
- |
96 |
- define DO_CC_ALTIVEC |
97 |
-@@ -1153,7 +1152,7 @@ |
98 |
- |
99 |
- define DO_REF_CC |
100 |
- $(echo_cmd) "REF_CC $<" |
101 |
--$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
102 |
-+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
103 |
- endef |
104 |
- |
105 |
- define DO_REF_CC_ALTIVEC |
106 |
-@@ -1171,7 +1170,7 @@ |
107 |
- |
108 |
- define DO_BOT_CC |
109 |
- $(echo_cmd) "BOT_CC $<" |
110 |
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< |
111 |
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< |
112 |
- endef |
113 |
- |
114 |
- ifeq ($(GENERATE_DEPENDENCIES),1) |
115 |
-@@ -1185,7 +1184,7 @@ |
116 |
- |
117 |
- define DO_DED_CC |
118 |
- $(echo_cmd) "DED_CC $<" |
119 |
--$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
120 |
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
121 |
- endef |
122 |
- |
123 |
- define DO_WINDRES |
124 |
- |
125 |
|
126 |
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild |
127 |
deleted file mode 100644 |
128 |
index 79cdded4b1d5..000000000000 |
129 |
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild |
130 |
+++ /dev/null |
131 |
@@ -1,169 +0,0 @@ |
132 |
-# Copyright 1999-2021 Gentoo Authors |
133 |
-# Distributed under the terms of the GNU General Public License v2 |
134 |
- |
135 |
-EAPI="7" |
136 |
- |
137 |
-inherit desktop flag-o-matic toolchain-funcs xdg-utils |
138 |
- |
139 |
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" |
140 |
-HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3" |
141 |
- |
142 |
-if [[ ${PV} == *9999 ]]; then |
143 |
- inherit git-r3 |
144 |
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git" |
145 |
- EGIT_BRANCH="urt" |
146 |
-else |
147 |
- COMMIT_ID="0429c03056720523d27ca71d5a4aa3e8d00709e7" |
148 |
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" |
149 |
- S="${WORKDIR}/ioq3-${COMMIT_ID}" |
150 |
- KEYWORDS="~amd64 ~x86" |
151 |
-fi |
152 |
- |
153 |
-LICENSE="GPL-2" |
154 |
-SLOT="0" |
155 |
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis" |
156 |
-REQUIRED_USE="|| ( client server ) |
157 |
- voip? ( opus )" |
158 |
- |
159 |
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt ) |
160 |
- |
161 |
-PATCHES=( |
162 |
- "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch |
163 |
-) |
164 |
- |
165 |
-RDEPEND=" |
166 |
- client? ( |
167 |
- media-libs/libsdl2:=[X,sound,joystick,opengl,video] |
168 |
- mumble? ( media-sound/mumble:= ) |
169 |
- openal? ( media-libs/openal:= ) |
170 |
- opus? ( media-libs/opusfile:= ) |
171 |
- vorbis? ( media-libs/libvorbis:= ) |
172 |
- ) |
173 |
- curl? ( net-misc/curl ) |
174 |
- ~games-fps/urbanterror-data-4.3.4 |
175 |
- sys-libs/zlib:=[minizip] |
176 |
- virtual/jpeg:0 |
177 |
-" |
178 |
- |
179 |
-DEPEND="${RDEPEND}" |
180 |
- |
181 |
-pkg_pretend() { |
182 |
- if use client; then |
183 |
- if ! use openal && ! use opus && ! use vorbis; then |
184 |
- ewarn |
185 |
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!" |
186 |
- fi |
187 |
- fi |
188 |
-} |
189 |
- |
190 |
-src_configure() { |
191 |
- default |
192 |
- |
193 |
- tc-export CC |
194 |
-} |
195 |
- |
196 |
-src_compile() { |
197 |
- # Workaround for used zlib macro, which got renamed in Gentoo |
198 |
- # wrt bug #449510 |
199 |
- append-cppflags "-DOF=_Z_OF" |
200 |
- |
201 |
- local myemakeargs=( |
202 |
- ARCH=$(usex amd64 "x86_64" "i686" ) |
203 |
- DEFAULT_BASEDIR="/usr/share/urbanterror" |
204 |
- BUILD_CLIENT=$(usex "client" 1 0) |
205 |
- BUILD_SERVER=$(usex "server" 1 0) |
206 |
- BUILD_BASEGAME=1 |
207 |
- BUILD_MISSIONPACK=0 |
208 |
- BUILD_GAME_SO=0 |
209 |
- BUILD_GAME_QVM=0 |
210 |
- BUILD_STANDALONE=1 |
211 |
- SERVERBIN="Quake3-UrT-Ded" |
212 |
- CLIENTBIN="Quake3-UrT" |
213 |
- USE_RENDERER_DLOPEN=0 |
214 |
- USE_YACC=0 |
215 |
- BASEGAME="q3ut4" |
216 |
- BASEGAME_CFLAGS="${CFLAGS}" |
217 |
- USE_OPENAL=$(usex "openal" 1 0) |
218 |
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0) |
219 |
- USE_CURL=$(usex "curl" 1 0) |
220 |
- USE_CURL_DLOPEN=$(usex "curl" 1 0) |
221 |
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0) |
222 |
- USE_CODEC_OPUS=$(usex "opus" 1 0) |
223 |
- USE_MUMBLE=$(usex "mumble" 1 0) |
224 |
- USE_SKEETMOD=$(usex "skeetshootmod" 1 0) |
225 |
- USE_VOIP=$(usex "mumble" 1 0) |
226 |
- USE_INTERNAL_LIBS=0 |
227 |
- USE_LOCAL_HEADERS=0 |
228 |
- USE_ALTGAMMA=$(usex "altgamma" 1 0) |
229 |
- $(usex "debug" "debug" "release") |
230 |
- ) |
231 |
- emake "${myemakeargs[@]}" |
232 |
-} |
233 |
- |
234 |
-src_install() { |
235 |
- local myarch=$(usex amd64 "x86_64" "i386") |
236 |
- local myreleasetype=$(usex debug "debug" "release") |
237 |
- |
238 |
- if use client; then |
239 |
- newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN} |
240 |
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html |
241 |
- make_desktop_entry ${PN} "UrbanTerror" ${PN} |
242 |
- fi |
243 |
- |
244 |
- if use server && ! use client; then |
245 |
- # dedicated server only |
246 |
- newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded |
247 |
- fi |
248 |
- |
249 |
- einstalldocs |
250 |
-} |
251 |
- |
252 |
-pkg_postinst() { |
253 |
- use client && xdg_desktop_database_update |
254 |
- |
255 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
256 |
- # ^this is a new installation, so: |
257 |
- if use openal; then |
258 |
- elog "" |
259 |
- elog "You might need to set:" |
260 |
- elog " seta s_useopenal \"1\"" |
261 |
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work." |
262 |
- fi |
263 |
- |
264 |
- if use altgamma; then |
265 |
- elog "" |
266 |
- elog "You might need to set:" |
267 |
- elog " seta r_altgamma \"1\"" |
268 |
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work." |
269 |
- elog "Be aware that altgamme works on a global scale, so external" |
270 |
- elog "applications like redshift can cause trouble. Disabling" |
271 |
- elog "these while playing is a usable workaround." |
272 |
- fi |
273 |
- |
274 |
- if ! use altgamma; then |
275 |
- elog "" |
276 |
- elog "If you are using a modesetting graphics driver you might" |
277 |
- elog "consider setting USE=\"altgamma\"." |
278 |
- elog "For details take a look at:" |
279 |
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222" |
280 |
- fi |
281 |
- |
282 |
- if ! use client; then |
283 |
- elog "" |
284 |
- elog "You disabled client support. You won't be able to connect" |
285 |
- elog "to any servers and play. If you want to do so, enable" |
286 |
- elog "USE=\"client\"." |
287 |
- fi |
288 |
- |
289 |
- if use skeetshootmod; then |
290 |
- elog "" |
291 |
- elog "You might need to set:" |
292 |
- elog " seta sv_skeetshoot \"1\"" |
293 |
- elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod." |
294 |
- fi |
295 |
- fi |
296 |
-} |
297 |
- |
298 |
-pkg_postrm() { |
299 |
- use client && xdg_desktop_database_update |
300 |
-} |