| 1 |
commit: f32bcdeee1d31d80e0a62facb25a6839f7f60b51 |
| 2 |
Author: Nils Freydank <holgersson <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Fri Nov 17 20:39:33 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 19 18:32:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32bcdee |
| 7 |
|
| 8 |
games-fps/urbanterror: Bump to 4.3.2_p20171105. |
| 9 |
|
| 10 |
This bump adds support for skeetshoot mod. For more details, see: |
| 11 |
https://github.com/mickael9/ioq3/pull/13 and |
| 12 |
upstream commit 31e6b45a323f8ded92a1b4b78530ea0bc5382b85. |
| 13 |
|
| 14 |
According to the effort to reorganise X related calls[1], and as the icon |
| 15 |
isn't shipped anymore, only xdg_desktop_database_update is called. |
| 16 |
|
| 17 |
This bump also fixes a wrong compiler call (cc instead of correct gcc-call). |
| 18 |
|
| 19 |
[1] https://wiki.gentoo.org/wiki/Notes_on_ebuilds_with_GUI |
| 20 |
|
| 21 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 22 |
Closes: https://github.com/gentoo/gentoo/pull/6156 |
| 23 |
|
| 24 |
games-fps/urbanterror/Manifest | 1 + |
| 25 |
.../files/urbanterror-4.3-fix-build_system.patch | 73 +++++++++ |
| 26 |
games-fps/urbanterror/metadata.xml | 5 +- |
| 27 |
.../urbanterror/urbanterror-4.3.2_p20171105.ebuild | 163 +++++++++++++++++++++ |
| 28 |
4 files changed, 240 insertions(+), 2 deletions(-) |
| 29 |
|
| 30 |
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest |
| 31 |
index f6cf1e0db7a..680a143fd69 100644 |
| 32 |
--- a/games-fps/urbanterror/Manifest |
| 33 |
+++ b/games-fps/urbanterror/Manifest |
| 34 |
@@ -2,3 +2,4 @@ DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 8009516332e1f77eae3681b4 |
| 35 |
DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4 WHIRLPOOL 2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290 |
| 36 |
DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e WHIRLPOOL 912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb |
| 37 |
DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 SHA256 a345cae14ce1f445ef1ed9d883f4f06e0365fdfa05c50d2f34bfcdb89744e405 SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea WHIRLPOOL d4a519b1c9a7e63a98e9901c815e73f1c467412f6ad6757dafd6c4afb013bd9c3d4da3155cdc91c728113078e466d39fa68c1bb404e8019ad75984bf683370ff |
| 38 |
+DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 SHA256 5b577d3c5ac62cbece532c54a3e30b2c89b9accb60657475a7cd2fb768f0bb02 SHA512 7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad WHIRLPOOL 680a170e50d2d398129e1c0788ffa622fb4795d810e01db216232a16e6d8024813d648bf2276a7cb1bf14187d8c32794b0bb48c83d854d5c9989be1bc716560b |
| 39 |
|
| 40 |
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 |
| 41 |
new file mode 100644 |
| 42 |
index 00000000000..b7a24a1b6e9 |
| 43 |
--- /dev/null |
| 44 |
+++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch |
| 45 |
@@ -0,0 +1,73 @@ |
| 46 |
+Author: Nils Freydank <holgersson@××××××.de> |
| 47 |
+Date: Fri Nov 17 20:30:00 2017 +0100 |
| 48 |
+ |
| 49 |
+Respect CFLAGS, CPPFLAGS etc. This patch is inspired |
| 50 |
+by hasufell’s patch. |
| 51 |
+ |
| 52 |
+--- a/Makefile 2017-03-31 11:08:58.419210817 +0200 |
| 53 |
++++ b/Makefile 2017-11-17 20:30:00.000000000 +0100 |
| 54 |
+@@ -223,7 +223,7 @@ |
| 55 |
+ ifndef USE_ALTGAMMA |
| 56 |
+ # Clearskies - X11-based gamma for Linux |
| 57 |
+ USE_ALTGAMMA=1 |
| 58 |
+-endif |
| 59 |
++ endif |
| 60 |
+ |
| 61 |
+ ifndef USE_SKEETMOD |
| 62 |
+ USE_SKEETMOD=0 |
| 63 |
+@@ -306,34 +306,33 @@ |
| 64 |
+ CLIENT_EXTRA_FILES= |
| 65 |
+ |
| 66 |
+ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu")) |
| 67 |
+- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ |
| 68 |
+- -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" |
| 69 |
++ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\" |
| 70 |
+ CLIENT_CFLAGS += $(SDL_CFLAGS) |
| 71 |
+ |
| 72 |
+- OPTIMIZEVM = -O3 |
| 73 |
+- OPTIMIZE = $(OPTIMIZEVM) -ffast-math |
| 74 |
++ OPTIMIZEVM = |
| 75 |
++ OPTIMIZE = $(OPTIMIZEVM) |
| 76 |
+ |
| 77 |
+ ifeq ($(ARCH),x86_64) |
| 78 |
+- OPTIMIZEVM = -O3 |
| 79 |
+- OPTIMIZE = $(OPTIMIZEVM) -ffast-math |
| 80 |
++ OPTIMIZEVM = |
| 81 |
++ OPTIMIZE = $(OPTIMIZEVM) |
| 82 |
+ HAVE_VM_COMPILED = true |
| 83 |
+ else |
| 84 |
+ ifeq ($(ARCH),x86) |
| 85 |
+- OPTIMIZEVM = -O3 -march=i586 |
| 86 |
+- OPTIMIZE = $(OPTIMIZEVM) -ffast-math |
| 87 |
++ OPTIMIZEVM = |
| 88 |
++ OPTIMIZE = $(OPTIMIZEVM) |
| 89 |
+ HAVE_VM_COMPILED=true |
| 90 |
+ else |
| 91 |
+ ifeq ($(ARCH),ppc) |
| 92 |
+- BASE_CFLAGS += -maltivec |
| 93 |
++ BASE_CFLAGS += |
| 94 |
+ HAVE_VM_COMPILED=true |
| 95 |
+ endif |
| 96 |
+ ifeq ($(ARCH),ppc64) |
| 97 |
+- BASE_CFLAGS += -maltivec |
| 98 |
++ BASE_CFLAGS += |
| 99 |
+ HAVE_VM_COMPILED=true |
| 100 |
+ endif |
| 101 |
+ ifeq ($(ARCH),sparc) |
| 102 |
+- OPTIMIZE += -mtune=ultrasparc3 -mv8plus |
| 103 |
+- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus |
| 104 |
++ OPTIMIZE += |
| 105 |
++ OPTIMIZEVM += |
| 106 |
+ HAVE_VM_COMPILED=true |
| 107 |
+ endif |
| 108 |
+ ifeq ($(ARCH),armv7l) |
| 109 |
+@@ -1124,7 +1123,7 @@ |
| 110 |
+ |
| 111 |
+ define DO_CC |
| 112 |
+ $(echo_cmd) "CC $<" |
| 113 |
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
| 114 |
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< |
| 115 |
+ endef |
| 116 |
+ |
| 117 |
+ define DO_REF_CC |
| 118 |
+ |
| 119 |
|
| 120 |
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml |
| 121 |
index 062f62f8466..38fad51f813 100644 |
| 122 |
--- a/games-fps/urbanterror/metadata.xml |
| 123 |
+++ b/games-fps/urbanterror/metadata.xml |
| 124 |
@@ -16,10 +16,11 @@ |
| 125 |
<use> |
| 126 |
<flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag> |
| 127 |
<flag name="client">Build binary for client (includes code for non-dedicated server)</flag> |
| 128 |
- <flag name="opus">Use opus as sound codec</flag> |
| 129 |
<flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag> |
| 130 |
- <flag name="voip">Use ioq3 ingame VoIP (experimental)</flag> |
| 131 |
+ <flag name="opus">Use opus as sound codec</flag> |
| 132 |
<flag name="server">Build binary for dedicated server</flag> |
| 133 |
+ <flag name="skeetshootmod">Build support for skeetshoot mod for specific maps</flag> |
| 134 |
+ <flag name="voip">Use ioq3 ingame VoIP (experimental)</flag> |
| 135 |
</use> |
| 136 |
<upstream> |
| 137 |
<remote-id type="github">Barbatos/ioq3-for-UrbanTerror-4</remote-id> |
| 138 |
|
| 139 |
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild |
| 140 |
new file mode 100644 |
| 141 |
index 00000000000..4bcbbaa4605 |
| 142 |
--- /dev/null |
| 143 |
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild |
| 144 |
@@ -0,0 +1,163 @@ |
| 145 |
+# Copyright 1999-2017 Gentoo Foundation |
| 146 |
+# Distributed under the terms of the GNU General Public License v2 |
| 147 |
+ |
| 148 |
+EAPI="6" |
| 149 |
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils |
| 150 |
+ |
| 151 |
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" |
| 152 |
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3" |
| 153 |
+ |
| 154 |
+if [[ ${PV} == "9999" ]]; then |
| 155 |
+ inherit git-r3 |
| 156 |
+ EGIT_REPO_URI="https://github.com/mickael9/ioq3.git" |
| 157 |
+ EGIT_BRANCH="urt" |
| 158 |
+else |
| 159 |
+ COMMIT_ID="59594a771796ae3b02e24a23807a808129931d1a" |
| 160 |
+ SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" |
| 161 |
+ S="${WORKDIR}/ioq3-${COMMIT_ID}" |
| 162 |
+ KEYWORDS="~amd64 ~x86" |
| 163 |
+fi |
| 164 |
+ |
| 165 |
+LICENSE="GPL-2" |
| 166 |
+SLOT="0" |
| 167 |
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis" |
| 168 |
+REQUIRED_USE=" || ( client server )" |
| 169 |
+ |
| 170 |
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch ) |
| 171 |
+RDEPEND=" |
| 172 |
+ client? ( |
| 173 |
+ media-libs/libsdl2:=[X,sound,joystick,opengl,video] |
| 174 |
+ mumble? ( media-sound/mumble:= ) |
| 175 |
+ openal? ( media-libs/openal:= ) |
| 176 |
+ opus? ( media-libs/opusfile:= ) |
| 177 |
+ vorbis? ( |
| 178 |
+ media-libs/libogg:= |
| 179 |
+ media-libs/libvorbis:= |
| 180 |
+ ) |
| 181 |
+ ) |
| 182 |
+ curl? ( net-misc/curl ) |
| 183 |
+ ~games-fps/urbanterror-data-4.3.2 |
| 184 |
+ sys-libs/zlib:=[minizip] |
| 185 |
+ virtual/jpeg:0 |
| 186 |
+" |
| 187 |
+ |
| 188 |
+DEPEND="${RDEPEND}" |
| 189 |
+ |
| 190 |
+pkg_pretend() { |
| 191 |
+ if use client; then |
| 192 |
+ if ! use openal && ! use opus && ! use vorbis; then |
| 193 |
+ ewarn |
| 194 |
+ ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!" |
| 195 |
+ fi |
| 196 |
+ fi |
| 197 |
+} |
| 198 |
+ |
| 199 |
+src_configure() { |
| 200 |
+ default |
| 201 |
+ |
| 202 |
+ tc-export CC |
| 203 |
+} |
| 204 |
+ |
| 205 |
+src_compile() { |
| 206 |
+ # Workaround for used zlib macro, which got renamed in Gentoo |
| 207 |
+ # wrt bug #449510 |
| 208 |
+ append-cppflags "-DOF=_Z_OF" |
| 209 |
+ |
| 210 |
+ local my_arch=$(usex amd64 "x86_64" "i386") |
| 211 |
+ |
| 212 |
+ emake \ |
| 213 |
+ ARCH=${my_arch} \ |
| 214 |
+ DEFAULT_BASEDIR="/usr/share/urbanterror" \ |
| 215 |
+ BUILD_CLIENT=$(usex "client" 1 0) \ |
| 216 |
+ BUILD_SERVER=$(usex "server" 1 0) \ |
| 217 |
+ BUILD_BASEGAME=1 \ |
| 218 |
+ BUILD_MISSIONPACK=0 \ |
| 219 |
+ BUILD_GAME_SO=0 \ |
| 220 |
+ BUILD_GAME_QVM=0 \ |
| 221 |
+ BUILD_STANDALONE=1 \ |
| 222 |
+ SERVERBIN="Quake3-UrT-Ded" \ |
| 223 |
+ CLIENTBIN="Quake3-UrT" \ |
| 224 |
+ USE_RENDERER_DLOPEN=0 \ |
| 225 |
+ USE_YACC=0 \ |
| 226 |
+ BASEGAME="q3ut4"\ |
| 227 |
+ BASEGAME_CFLAGS="${CFLAGS}" \ |
| 228 |
+ USE_OPENAL=$(usex "openal" 1 0) \ |
| 229 |
+ USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \ |
| 230 |
+ USE_CURL=$(usex "curl" 1 0) \ |
| 231 |
+ USE_CURL_DLOPEN=$(usex "curl" 1 0) \ |
| 232 |
+ USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \ |
| 233 |
+ USE_CODEC_OPUS=$(usex "opus" 1 0) \ |
| 234 |
+ USE_MUMBLE=$(usex "mumble" 1 0) \ |
| 235 |
+ USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \ |
| 236 |
+ USE_VOIP=$(usex "mumble" 1 0) \ |
| 237 |
+ USE_INTERNAL_LIBS=0 \ |
| 238 |
+ USE_LOCAL_HEADERS=0 \ |
| 239 |
+ USE_ALTGAMMA=$(usex "altgamma" 1 0) |
| 240 |
+} |
| 241 |
+ |
| 242 |
+src_install() { |
| 243 |
+ local my_arch=$(usex amd64 "x86_64" "i386") |
| 244 |
+ # docs from ioq3, not from UrbanTerror ZIP file |
| 245 |
+ dodoc ChangeLog README.md README.ioq3.md md4-readme.txt |
| 246 |
+ |
| 247 |
+ if use client; then |
| 248 |
+ newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN} |
| 249 |
+ # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html |
| 250 |
+ make_desktop_entry ${PN} "UrbanTerror" ${PN} |
| 251 |
+ fi |
| 252 |
+ |
| 253 |
+ if use server && ! use client; then |
| 254 |
+ # dedicated server only |
| 255 |
+ newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded |
| 256 |
+ fi |
| 257 |
+} |
| 258 |
+ |
| 259 |
+pkg_postinst() { |
| 260 |
+ use client && xdg_desktop_database_update |
| 261 |
+ |
| 262 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 263 |
+ # This is a new installation |
| 264 |
+ if use openal; then |
| 265 |
+ elog "" |
| 266 |
+ elog "You might need to set:" |
| 267 |
+ elog " seta s_useopenal \"1\"" |
| 268 |
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work." |
| 269 |
+ fi |
| 270 |
+ |
| 271 |
+ if use altgamma; then |
| 272 |
+ elog "" |
| 273 |
+ elog "You might need to set:" |
| 274 |
+ elog " seta r_altgamma \"1\"" |
| 275 |
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work." |
| 276 |
+ fi |
| 277 |
+ |
| 278 |
+ if ! use altgamma; then |
| 279 |
+ elog "" |
| 280 |
+ elog "If you are using a modesetting graphics driver you might" |
| 281 |
+ elog "consider setting USE=\"altgamma\"." |
| 282 |
+ elog "For details take a look at:" |
| 283 |
+ elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222" |
| 284 |
+ fi |
| 285 |
+ |
| 286 |
+ if ! use client; then |
| 287 |
+ elog "" |
| 288 |
+ elog "You disabled client support. You won't be able to connect" |
| 289 |
+ elog "to any servers and play. If you want to do so, enable" |
| 290 |
+ elog "USE=\"client\"." |
| 291 |
+ fi |
| 292 |
+ fi |
| 293 |
+ |
| 294 |
+ if ver_test -ge 4.3.2_p20171105; then |
| 295 |
+ # Yippee, new features! |
| 296 |
+ if use skeetshootmod; then |
| 297 |
+ elog "" |
| 298 |
+ elog "You might need to set:" |
| 299 |
+ elog " seta sv_skeetshoot \"1\"" |
| 300 |
+ elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod." |
| 301 |
+ fi |
| 302 |
+ fi |
| 303 |
+} |
| 304 |
+ |
| 305 |
+pkg_postrm() { |
| 306 |
+ use client && xdg_desktop_database_update |
| 307 |
+} |
Archives