* [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
@ 2017-05-10 19:58 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2017-05-10 19:58 UTC (permalink / raw
To: gentoo-commits
commit: fccde5cf308d9d08016e70873ca8ca041c94b7e7
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Wed May 10 19:55:21 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed May 10 19:55:32 2017 +0000
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 <whissi <AT> 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 00000000000..5ce13342ab5
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
@@ -0,0 +1,53 @@
+Author: holgersson <holgersson@posteo.de>
+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 a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
index 8aa6fc306a0..062f62f8466 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -1,14 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>holgersson@posteo.de</email>
+ <name>Nils Freydank</name>
+ </maintainer>
<maintainer type="project">
<email>games@gentoo.org</email>
<name>Gentoo Games Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
- <flag name="altgamma">Clearskies - X11-based gamma for Linux</flag>
- <flag name="server">Build server target</flag>
- <flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
+ <flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag>
+ <flag name="client">Build binary for client (includes code for non-dedicated server)</flag>
+ <flag name="opus">Use opus as sound codec</flag>
+ <flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag>
+ <flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
+ <flag name="server">Build binary for dedicated server</flag>
</use>
<upstream>
<remote-id type="github">Barbatos/ioq3-for-UrbanTerror-4</remote-id>
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
new file mode 100644
index 00000000000..5d79cf7096e
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit flag-o-matic gnome2-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+ EGIT_BRANCH="urt"
+else
+ COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
+ SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ioq3-${COMMIT_ID}"
+ KEYWORDS="~x86 ~amd64"
+
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
+
+RDEPEND="
+ client? (
+ media-libs/libsdl2[X,sound,joystick,opengl,video]
+ mumble? ( media-sound/mumble )
+ openal? ( media-libs/openal )
+ opus? ( media-libs/opusfile )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ )
+ curl? ( net-misc/curl )
+ ~games-fps/urbanterror-data-4.3.2
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+ if use client; then
+ if ! use openal && ! use opus && ! use vorbis; then
+ ewarn
+ ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+ fi
+ fi
+}
+
+src_compile() {
+ buildit() { use $1 && echo 1 || echo 0 ; }
+ nobuildit() { use $1 && echo 0 || echo 1 ; }
+
+ # Workaround for used zlib macro, wrt bug #44951
+ append-flags "-DOF=_Z_OF"
+
+ emake \
+ ARCH=$(usex amd64 "x86_64" "i386") \
+ DEFAULT_BASEDIR="/usr/share/urbanterror" \
+ BUILD_CLIENT=$(buildit client) \
+ BUILD_SERVER=$(buildit server) \
+ BUILD_BASEGAME=1 \
+ BUILD_MISSIONPACK=0 \
+ BUILD_GAME_SO=0 \
+ BUILD_GAME_QVM=0 \
+ BUILD_STANDALONE=1 \
+ SERVERBIN="Quake3-UrT-Ded" \
+ CLIENTBIN="Quake3-UrT" \
+ USE_RENDERER_DLOPEN=0 \
+ USE_YACC=0 \
+ BASEGAME="q3ut4"\
+ BASEGAME_CFLAGS="${CFLAGS}" \
+ USE_OPENAL=$(buildit openal) \
+ USE_OPENAL_DLOPEN=$(buildit openal) \
+ USE_CURL=$(buildit curl) \
+ USE_CURL_DLOPEN=$(buildit curl) \
+ USE_CODEC_VORBIS=$(buildit vorbis) \
+ USE_CODEC_OPUS=$(buildit opus) \
+ USE_MUMBLE=$(buildit mumble) \
+ USE_VOIP=$(buildit voip) \
+ USE_INTERNAL_LIBS=0 \
+ USE_LOCAL_HEADERS=0 \
+ USE_ALTGAMMA=$(buildit altgamma)
+}
+
+src_install() {
+ local my_arch=$(usex amd64 "x86_64" "i386")
+
+ # docs from ioq3, not from UrbanTerror ZIP file
+ dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
+
+ if use client; then
+ newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
+ # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+ make_desktop_entry ${PN} "UrbanTerror" ${PN}
+ fi
+
+ if use server && ! use client; then
+ # dedicated server only
+ newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
+ fi
+}
+
+pkg_preinst() {
+ use client && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ use client && gnome2_icon_cache_update
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ if use openal; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta s_useopenal \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+ fi
+
+ if use altgamma; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta r_altgamma \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+ fi
+
+ if ! use altgamma; then
+ elog ""
+ elog "If you are using a modesetting graphics driver you might"
+ elog "consider setting USE=\"altgamma\"."
+ elog "For details take a look at:"
+ elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+ fi
+ if ! use client; then
+ elog ""
+ elog "You disabled client support. You won't be able to connect"
+ elog "to any servers and play. If you want to do so, enable"
+ elog "USE=\"client\"."
+ fi
+ fi
+}
+
+pkg_postrm() {
+ use client && gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
@ 2017-11-19 18:33 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-11-19 18:33 UTC (permalink / raw
To: gentoo-commits
commit: f32bcdeee1d31d80e0a62facb25a6839f7f60b51
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Fri Nov 17 20:39:33 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 18:32:43 2017 +0000
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 00000000000..b7a24a1b6e9
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
@@ -0,0 +1,73 @@
+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.
+
+--- a/Makefile 2017-03-31 11:08:58.419210817 +0200
++++ b/Makefile 2017-11-17 20:30:00.000000000 +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)
+@@ -1124,7 +1123,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_REF_CC
+
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
index 062f62f8466..38fad51f813 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -16,10 +16,11 @@
<use>
<flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag>
<flag name="client">Build binary for client (includes code for non-dedicated server)</flag>
- <flag name="opus">Use opus as sound codec</flag>
<flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag>
- <flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
+ <flag name="opus">Use opus as sound codec</flag>
<flag name="server">Build binary for dedicated server</flag>
+ <flag name="skeetshootmod">Build support for skeetshoot mod for specific maps</flag>
+ <flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
</use>
<upstream>
<remote-id type="github">Barbatos/ioq3-for-UrbanTerror-4</remote-id>
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
new file mode 100644
index 00000000000..4bcbbaa4605
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+ EGIT_BRANCH="urt"
+else
+ COMMIT_ID="59594a771796ae3b02e24a23807a808129931d1a"
+ SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ioq3-${COMMIT_ID}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+RDEPEND="
+ client? (
+ media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+ mumble? ( media-sound/mumble:= )
+ openal? ( media-libs/openal:= )
+ opus? ( media-libs/opusfile:= )
+ vorbis? (
+ media-libs/libogg:=
+ media-libs/libvorbis:=
+ )
+ )
+ curl? ( net-misc/curl )
+ ~games-fps/urbanterror-data-4.3.2
+ sys-libs/zlib:=[minizip]
+ virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+ if use client; then
+ if ! use openal && ! use opus && ! use vorbis; then
+ ewarn
+ ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+ fi
+ fi
+}
+
+src_configure() {
+ default
+
+ tc-export CC
+}
+
+src_compile() {
+ # Workaround for used zlib macro, which got renamed in Gentoo
+ # wrt bug #449510
+ append-cppflags "-DOF=_Z_OF"
+
+ local my_arch=$(usex amd64 "x86_64" "i386")
+
+ emake \
+ ARCH=${my_arch} \
+ DEFAULT_BASEDIR="/usr/share/urbanterror" \
+ BUILD_CLIENT=$(usex "client" 1 0) \
+ BUILD_SERVER=$(usex "server" 1 0) \
+ BUILD_BASEGAME=1 \
+ BUILD_MISSIONPACK=0 \
+ BUILD_GAME_SO=0 \
+ BUILD_GAME_QVM=0 \
+ BUILD_STANDALONE=1 \
+ SERVERBIN="Quake3-UrT-Ded" \
+ CLIENTBIN="Quake3-UrT" \
+ USE_RENDERER_DLOPEN=0 \
+ USE_YACC=0 \
+ BASEGAME="q3ut4"\
+ BASEGAME_CFLAGS="${CFLAGS}" \
+ USE_OPENAL=$(usex "openal" 1 0) \
+ USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+ USE_CURL=$(usex "curl" 1 0) \
+ USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+ USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+ USE_CODEC_OPUS=$(usex "opus" 1 0) \
+ USE_MUMBLE=$(usex "mumble" 1 0) \
+ USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
+ USE_VOIP=$(usex "mumble" 1 0) \
+ USE_INTERNAL_LIBS=0 \
+ USE_LOCAL_HEADERS=0 \
+ USE_ALTGAMMA=$(usex "altgamma" 1 0)
+}
+
+src_install() {
+ local my_arch=$(usex amd64 "x86_64" "i386")
+ # docs from ioq3, not from UrbanTerror ZIP file
+ dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
+
+ if use client; then
+ newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
+ # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+ make_desktop_entry ${PN} "UrbanTerror" ${PN}
+ fi
+
+ if use server && ! use client; then
+ # dedicated server only
+ newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
+ fi
+}
+
+pkg_postinst() {
+ use client && xdg_desktop_database_update
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ if use openal; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta s_useopenal \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+ fi
+
+ if use altgamma; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta r_altgamma \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+ fi
+
+ if ! use altgamma; then
+ elog ""
+ elog "If you are using a modesetting graphics driver you might"
+ elog "consider setting USE=\"altgamma\"."
+ elog "For details take a look at:"
+ elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+ fi
+
+ if ! use client; then
+ elog ""
+ elog "You disabled client support. You won't be able to connect"
+ elog "to any servers and play. If you want to do so, enable"
+ elog "USE=\"client\"."
+ fi
+ fi
+
+ if ver_test -ge 4.3.2_p20171105; then
+ # Yippee, new features!
+ if use skeetshootmod; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta sv_skeetshoot \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
+ fi
+ fi
+}
+
+pkg_postrm() {
+ use client && xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
@ 2017-12-10 20:42 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2017-12-10 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 621814eb0f86ad1cecd86f730b48f8db23089a63
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Sat Dec 9 10:54:14 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 20:40:20 2017 +0000
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 9934317fb649e652628639f9ea35cdaa0466363b52ea7325198aaaa6360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91 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..00000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: holgersson <holgersson@posteo.de>
-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 a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
deleted file mode 100644
index 522657485a4..00000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- # Workaround for used zlib macro, wrt bug #44951
- append-flags "-DOF=_Z_OF"
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(buildit client) \
- BUILD_SERVER=$(buildit server) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=$(buildit openal) \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=$(buildit curl) \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_CODEC_OPUS=$(buildit opus) \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voip) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(buildit altgamma)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
deleted file mode 100644
index ba228d05417..00000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="8eb3e10163c62331b77171a71ca6102d3d63c3e7"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- # Workaround for used zlib macro, wrt bug #44951
- append-flags "-DOF=_Z_OF"
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(buildit client) \
- BUILD_SERVER=$(buildit server) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=$(buildit openal) \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=$(buildit curl) \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_CODEC_OPUS=$(buildit opus) \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voip) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(buildit altgamma)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
deleted file mode 100644
index 6265e8c10cd..00000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="0b3e62a00bd05d337f2ab6dad2cdb311a5d76464"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- # Workaround for used zlib macro, wrt bug #44951
- append-flags "-DOF=_Z_OF"
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(buildit client) \
- BUILD_SERVER=$(buildit server) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=$(buildit openal) \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=$(buildit curl) \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_CODEC_OPUS=$(buildit opus) \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voip) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(buildit altgamma)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
deleted file mode 100644
index 468e8992705..00000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="3e555ab1405c38556cbfcdd42eac23a4af49e633"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- # Workaround for used zlib macro, wrt bug #449510
- append-flags "-DOF=_Z_OF"
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- emake \
- ARCH=${my_arch} \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(usex "client" 1 0) \
- BUILD_SERVER=$(usex "server" 1 0) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(usex "openal" 1 0) \
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
- USE_CURL=$(usex "curl" 1 0) \
- USE_CURL_DLOPEN=$(usex "curl" 1 0) \
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
- USE_CODEC_OPUS=$(usex "opus" 1 0) \
- USE_MUMBLE=$(usex "mumble" 1 0) \
- USE_VOIP=$(usex "mumble" 1 0) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(usex "altgamma" 1 0)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
deleted file mode 100644
index 4bcbbaa4605..00000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="59594a771796ae3b02e24a23807a808129931d1a"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
-RDEPEND="
- client? (
- media-libs/libsdl2:=[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble:= )
- openal? ( media-libs/openal:= )
- opus? ( media-libs/opusfile:= )
- vorbis? (
- media-libs/libogg:=
- media-libs/libvorbis:=
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib:=[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_configure() {
- default
-
- tc-export CC
-}
-
-src_compile() {
- # Workaround for used zlib macro, which got renamed in Gentoo
- # wrt bug #449510
- append-cppflags "-DOF=_Z_OF"
-
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- emake \
- ARCH=${my_arch} \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(usex "client" 1 0) \
- BUILD_SERVER=$(usex "server" 1 0) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(usex "openal" 1 0) \
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
- USE_CURL=$(usex "curl" 1 0) \
- USE_CURL_DLOPEN=$(usex "curl" 1 0) \
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
- USE_CODEC_OPUS=$(usex "opus" 1 0) \
- USE_MUMBLE=$(usex "mumble" 1 0) \
- USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
- USE_VOIP=$(usex "mumble" 1 0) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(usex "altgamma" 1 0)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_postinst() {
- use client && xdg_desktop_database_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
-
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-
- if ver_test -ge 4.3.2_p20171105; then
- # Yippee, new features!
- if use skeetshootmod; then
- elog ""
- elog "You might need to set:"
- elog " seta sv_skeetshoot \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
@ 2018-10-12 0:57 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2018-10-12 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 90634c11e58fb05e344b8259225cea15fd6ff75f
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Mon Oct 8 11:37:22 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 00:56:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90634c11
games-fps/urbanterror: Cleanup old files
Signed-off-by: Nils Freydank <holgersson <AT> 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 <AT> 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..00000000000
--- 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 c34ebe84ced..00000000000
--- 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)
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
deleted file mode 100644
index 04d4459533e..00000000000
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop eapi7-ver 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} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
- voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
- "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
- client? (
- media-libs/libsdl2:=[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble:= )
- openal? ( media-libs/openal:= )
- opus? ( media-libs/opusfile:= )
- vorbis? ( media-libs/libvorbis:= )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.4
- sys-libs/zlib:=[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_configure() {
- default
-
- tc-export CC
-}
-
-src_compile() {
- # Workaround for used zlib macro, which got renamed in Gentoo
- # wrt bug #449510
- append-cppflags "-DOF=_Z_OF"
-
- local myemakeargs=(
- ARCH=$(usex amd64 "x86_64" "i686" )
- DEFAULT_BASEDIR="/usr/share/urbanterror"
- BUILD_CLIENT=$(usex "client" 1 0)
- BUILD_SERVER=$(usex "server" 1 0)
- BUILD_BASEGAME=1
- BUILD_MISSIONPACK=0
- BUILD_GAME_SO=0
- BUILD_GAME_QVM=0
- BUILD_STANDALONE=1
- SERVERBIN="Quake3-UrT-Ded"
- CLIENTBIN="Quake3-UrT"
- USE_RENDERER_DLOPEN=0
- USE_YACC=0
- BASEGAME="q3ut4"
- BASEGAME_CFLAGS="${CFLAGS}"
- USE_OPENAL=$(usex "openal" 1 0)
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
- USE_CURL=$(usex "curl" 1 0)
- USE_CURL_DLOPEN=$(usex "curl" 1 0)
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
- USE_CODEC_OPUS=$(usex "opus" 1 0)
- USE_MUMBLE=$(usex "mumble" 1 0)
- USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
- USE_VOIP=$(usex "mumble" 1 0)
- USE_INTERNAL_LIBS=0
- USE_LOCAL_HEADERS=0
- USE_ALTGAMMA=$(usex "altgamma" 1 0)
- $(usex "debug" "debug" "release")
- )
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- local myarch=$(usex amd64 "x86_64" "i386")
- local myreleasetype=$(usex debug "debug" "release")
-
- if use client; then
- newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use client && xdg_desktop_database_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # ^this is a new installation, so:
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- elog "Be aware that altgamme works on a global scale, so external"
- elog "applications like redshift can cause trouble. Disabling"
- elog "these while playing is a usable workaround."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
-
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
-
- if use skeetshootmod; then
- elog ""
- elog "You might need to set:"
- elog " seta sv_skeetshoot \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/
@ 2018-10-12 0:57 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2018-10-12 0:57 UTC (permalink / raw
To: gentoo-commits
commit: cf5d7766d3f092350296317c00558a035acc7246
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Mon Oct 8 10:58:03 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 00:56:44 2018 +0000
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 <holgersson <AT> posteo.de>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> 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 00000000000..fddd8df5bf3
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
@@ -0,0 +1,94 @@
+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!
+Edit 2018-09-01: Update to take Makefile changes into account.
+
+--- a/Makefile 2018-07-08 11:00:00.000000000 +0200
++++ b/Makefile 2018-09-01 11:00:00.000000001 +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 00000000000..2eed0405afc
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+ EGIT_BRANCH="urt"
+else
+ COMMIT_ID="167cb6b611ad27f30787a2fe204a7c65ec1fa18e"
+ SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/ioq3-${COMMIT_ID}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
+REQUIRED_USE="|| ( client server )
+ voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch
+)
+
+RDEPEND="
+ client? (
+ media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+ mumble? ( media-sound/mumble:= )
+ openal? ( media-libs/openal:= )
+ opus? ( media-libs/opusfile:= )
+ vorbis? ( media-libs/libvorbis:= )
+ )
+ curl? ( net-misc/curl )
+ ~games-fps/urbanterror-data-4.3.4
+ sys-libs/zlib:=[minizip]
+ virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+ if use client; then
+ if ! use openal && ! use opus && ! use vorbis; then
+ ewarn
+ ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
+ fi
+ fi
+}
+
+src_configure() {
+ default
+
+ tc-export CC
+}
+
+src_compile() {
+ # Workaround for used zlib macro, which got renamed in Gentoo
+ # wrt bug #449510
+ append-cppflags "-DOF=_Z_OF"
+
+ local myemakeargs=(
+ ARCH=$(usex amd64 "x86_64" "i686" )
+ DEFAULT_BASEDIR="/usr/share/urbanterror"
+ BUILD_CLIENT=$(usex "client" 1 0)
+ BUILD_SERVER=$(usex "server" 1 0)
+ BUILD_BASEGAME=1
+ BUILD_MISSIONPACK=0
+ BUILD_GAME_SO=0
+ BUILD_GAME_QVM=0
+ BUILD_STANDALONE=1
+ SERVERBIN="Quake3-UrT-Ded"
+ CLIENTBIN="Quake3-UrT"
+ USE_RENDERER_DLOPEN=0
+ USE_YACC=0
+ BASEGAME="q3ut4"
+ BASEGAME_CFLAGS="${CFLAGS}"
+ USE_OPENAL=$(usex "openal" 1 0)
+ USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+ USE_CURL=$(usex "curl" 1 0)
+ USE_CURL_DLOPEN=$(usex "curl" 1 0)
+ USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
+ USE_CODEC_OPUS=$(usex "opus" 1 0)
+ USE_MUMBLE=$(usex "mumble" 1 0)
+ USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
+ USE_VOIP=$(usex "mumble" 1 0)
+ USE_INTERNAL_LIBS=0
+ USE_LOCAL_HEADERS=0
+ USE_ALTGAMMA=$(usex "altgamma" 1 0)
+ $(usex "debug" "debug" "release")
+ )
+ emake "${myemakeargs[@]}"
+}
+
+src_install() {
+ local myarch=$(usex amd64 "x86_64" "i386")
+ local myreleasetype=$(usex debug "debug" "release")
+
+ if use client; then
+ newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
+ # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+ make_desktop_entry ${PN} "UrbanTerror" ${PN}
+ fi
+
+ if use server && ! use client; then
+ # dedicated server only
+ newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
+ fi
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use client && xdg_desktop_database_update
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # ^this is a new installation, so:
+ if use openal; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta s_useopenal \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+ fi
+
+ if use altgamma; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta r_altgamma \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+ elog "Be aware that altgamme works on a global scale, so external"
+ elog "applications like redshift can cause trouble. Disabling"
+ elog "these while playing is a usable workaround."
+ fi
+
+ if ! use altgamma; then
+ elog ""
+ elog "If you are using a modesetting graphics driver you might"
+ elog "consider setting USE=\"altgamma\"."
+ elog "For details take a look at:"
+ elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+ fi
+
+ if ! use client; then
+ elog ""
+ elog "You disabled client support. You won't be able to connect"
+ elog "to any servers and play. If you want to do so, enable"
+ elog "USE=\"client\"."
+ fi
+
+ if use skeetshootmod; then
+ elog ""
+ elog "You might need to set:"
+ elog " seta sv_skeetshoot \"1\""
+ elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
+ fi
+ fi
+}
+
+pkg_postrm() {
+ use client && xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-12 0:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-10 19:58 [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2017-11-19 18:33 David Seifert
2017-12-10 20:42 James Le Cuirot
2018-10-12 0:57 Thomas Deutschmann
2018-10-12 0:57 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox