commit: 07c3c881884adf805e49bae44a0c70856f6470aa Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Sat Feb 14 14:01:12 2015 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Sat Feb 14 14:01:12 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=07c3c881
update urbanterror include pax-marking for hardened users --- games-fps/urbanterror/Manifest | 11 ++ .../files/urbanterror-4.2.021-build.patch | 75 ++++++++++ games-fps/urbanterror/urbanterror-4.2.023.ebuild | 158 +++++++++++++++++++++ 3 files changed, 244 insertions(+) diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest new file mode 100644 index 0000000..c7877b3 --- /dev/null +++ b/games-fps/urbanterror/Manifest @@ -0,0 +1,11 @@ +AUX urbanterror-4.2.021-build.patch 2186 SHA256 2c430b077978c7289c2515dab5cd898b3ab0de32aa99be426047b7461ff196f9 SHA512 1c93d6e7365b77d39014af7a6e15e934cfbaf544ef688e8c84fefaca63ee8e68733ca3115611464fc097b8c9171c00df13976472976c510433dc35ac3855a2b3 WHIRLPOOL a3cefa6451b88d2a1537b711d32dea2fd253ca92a794896ec842b069189eb519fdd59b829573966d024e7a19bc3355d7d7d41028718a2b3c1bf65c8de2b89b8c +DIST UrbanTerror-4.2.017-to-4.2.018.zip 9485349 SHA256 9d8a4cb258a60b2f464daaa998d9d26244f339fac562fb0c3cb4e00683968163 SHA512 a64e996a8538219ecc4300e25a31c14471593588e236ce4585c65d97b7306db7208f31549c08636657f1bd52142d7ba3aa2e72ab60a375d7a46949b6c18dac48 WHIRLPOOL 239595f7f75cc4fb9976c817a08eaa77e9413a913106b581459c84438babfe68c62ebb9775359c3dad460aeea48afaacd136d318ce9d0aa4abc0bd25ab92736c +DIST UrbanTerror-4.2.018-to-4.2.019.zip 220929569 SHA256 79f1bd49cc7c84fc7d24d7219a1057ecca932de2f583b310f40af1052b494ab1 SHA512 1ad7dd8e35daf1688f2c2919108946ae19d59c4d1e267b7186287cd9c01b373db8d4a71fa44d9bede7f964badef904ed3947ff0ab66e858d8b8c1bee6db609e0 WHIRLPOOL 85e005c52821a45f4d89acc5649de2377c6b7979fe2467b77300f6fe8f5ce190132dd723b50c4e7c6ff4a3ab0daee0eba1dbf88c2afd846159a4a6ace778c544 +DIST UrbanTerror-4.2.019-to-4.2.020.zip 11159789 SHA256 fef6c8d096912d79aee4bf8fb5d68db0c7a39c97df112190aa68e8f0ce8c5e27 SHA512 59efb23b92926b5649c324d2b4a203b4caf1b77e4d40816a49abcbc9ae92d0206123034676470bc0eab1bea62e7d384dfa566b699e9e9ffacedad0fd3900e4e8 WHIRLPOOL f7b679fca1ed15628f1cdf9d3632ffb8f37b09f1b3e095598ee3d49e119964157836650c9eaacbae7b9bc95e570556a983efee180172a1e714c9121579ccbc11 +DIST UrbanTerror-4.2.020-to-4.2.021.zip 11984899 SHA256 054437b0da8e71bbaa2d964627dd41837add365116708a29a1ae481284df17f7 SHA512 9c8774d7e6e0317f8381130870a69aecefcd9d929525d0029ed9c5dc93d19fe3f85857d0c7bc9be64e936a061b2f30a242b685df27961175670eb29a0b3b6370 WHIRLPOOL a9fee3c0fda7f688c8c5664c82e6e2a4542d1496c72ff8cd572d238fa0af63fc398b9005de54093e07781abacc678c3df4cf725b348d01d1fca59fdb4f0fcb58 +DIST UrbanTerror-4.2.021-to-4.2.022.zip 15258009 SHA256 65898bc3a9c9678f9223aa9031aef9e276fb62b40aaa6deab2df5f5ddf04fb38 SHA512 a792970f6ea193ce41cdb38632d54904c4a61a8156f0647a5cb35082c4a6602057060ad131833545a44679010edf67fb263be3f701a415c8e81e7ccb628a6505 WHIRLPOOL 30b14d895f4a5c41a044da2e8718f4f89709daee931d874214c9f2037447a171d29ab10cb259e48d74208abe5248ee3cccf07cd2edf2f6b7b3f551f177689e40 +DIST UrbanTerror-4.2.022-to-4.2.023.zip 15296685 SHA256 71d34f4245c264dd729d40cf76c1471c89606891f88fda28e007ebe6a052dde9 SHA512 2b35a34cf478939b850fd6f9b2f4a46f55259f32574799968ec4595c8e7c8930910ac6958bf03c99d63516cc4a41dbd6faaad4207326e42a19981561d25aff0e WHIRLPOOL bc13ec862ad829a5b417b114d50cc3f3dc1701b3c6fd136bafa0e2a68f0bbe44d03ea33a832e4882ab7cf63f3202b1ff6f62660bc69273542165d8e7f1e36d2f +DIST UrbanTerror42_full017.zip 1701599483 SHA256 d7849509c91c11e986ef6d47f51e7711ec53100ff42bef44095c32d91c65d7c2 SHA512 5363a21d6e21090a823eb21b82ac089640602151292f2985b6d26fc061e891e3bcadc5b0d4751f829cf6b9fe664bc619706e0e008210734bc1ef6afea3d46f96 WHIRLPOOL ee7553949f882c795eadc36dba57c923d3c49bc768aac128bfaae999bf9466c551df71946a9e8856210e5dea42c32887cb96d30f1339bba117bf9ee0c35c7edd +DIST urbanterror-4.2.023.tar.gz 12637911 SHA256 17c79f4ed1adc0859a20f0b19ab75f04e1e7ff518c882b5cd68199b44acff90f SHA512 c0b3fb0d53889561124ea034bd2b579c3b56489e751adf9479b86c54855b4f0917589a41caa7c1a534afee59983f77394a1c76dc92534dc84116a5566c19e8e5 WHIRLPOOL 68fa26a7a0ea19a1b7b3ced968515e1b326a9f7acabc30096b15880a772c4ca4faa764fb1fd4ab07d616718c550284af88cd03deeb8b11b7003b96336413d3ee +DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c +EBUILD urbanterror-4.2.023.ebuild 4230 SHA256 bd441e7e0f2398f0db9d5fbd1149e1f3255bb760851aa4254a12ed4e44bbe483 SHA512 25779cc2bad6d071f2c7131c2c2074f40a0f11363e92bf540b8bf757627e9f880023c470e6cf83df54e43c82ef344b48eb2a6bf3cd156b0290fc14af7e1c7b45 WHIRLPOOL 5638534904faa0db5d0e6c22efaeaf6bb7df73063b5715b09816ce442b561c6fb8942b289c182f6e99da97c5892a683f354318d0a379945261439cdd602cc966 diff --git a/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch new file mode 100644 index 0000000..daa7e32 --- /dev/null +++ b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch @@ -0,0 +1,75 @@ +Author: hasufell <[email protected]> +Date: Wed Jul 10 01:25:27 2013 +0200 + + respect CFLAGS/LDFLAGS + +--- a/Makefile ++++ b/Makefile +@@ -213,7 +213,7 @@ + endif + endif + +- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe ++ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes + + ifeq ($(USE_OPENAL),1) + BASE_CFLAGS += -DUSE_OPENAL=1 +@@ -239,19 +239,15 @@ + BASE_CFLAGS += -I/usr/X11R6/include + endif + +- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer ++ OPTIMIZE = + + ifeq ($(ARCH),x86_64) +- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ +- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ +- -fstrength-reduce ++ OPTIMIZE = + # experimental x86_64 jit compiler! you need GNU as + HAVE_VM_COMPILED = true + else + ifeq ($(ARCH),i386) +- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ +- -funroll-loops -falign-loops=2 -falign-jumps=2 \ +- -falign-functions=2 -fstrength-reduce ++ OPTIMIZE = + HAVE_VM_COMPILED=true + else + ifeq ($(ARCH),ppc) +@@ -265,7 +261,7 @@ + BASE_CFLAGS += -DNO_VM_COMPILED + endif + +- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 ++ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) + + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) + +@@ -274,7 +270,7 @@ + SHLIBLDFLAGS=-shared $(LDFLAGS) + + THREAD_LDFLAGS=-lpthread +- LDFLAGS=-ldl -lm ++ LDFLAGS+=-ldl -lm + + ifeq ($(USE_SDL),1) + CLIENT_LDFLAGS=$(shell sdl-config --libs) +@@ -1158,13 +1154,13 @@ + + $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) + $(echo_cmd) "LD $@" +- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ +- $(LDFLAGS) $(LIBSDLMAIN) ++ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ ++ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) + + $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) + $(echo_cmd) "LD $@" +- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ +- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) ++ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ ++ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) + + ifneq ($(strip $(LIBSDLMAIN)),) + ifneq ($(strip $(LIBSDLMAINSRC)),) diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild new file mode 100644 index 0000000..4f6c2f8 --- /dev/null +++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.021.ebuild,v 1.1 2014/11/20 20:13:51 hasufell Exp $ + +EAPI=5 + +inherit check-reqs eutils gnome2-utils games pax-utils + +ENGINE_PV=${PV} +FULL_P=UrbanTerror42_full017 +UPDATE_PV=${PV:0:3}.${FULL_P#*full} +DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" +HOMEPAGE="http://www.urbanterror.info/home/"; +SRC_URI="http://up.barbatos.fr/urt/${FULL_P}.zip + https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz + http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg" + +# fetch updates +if [[ ${FULL_P#*full} != ${PV#*.} ]] ; then + UPDATE_I=${UPDATE_PV:5:2} + while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do + SRC_URI="${SRC_URI} http://up.barbatos.fr/urt/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$(( ${UPDATE_I} + 1)).zip" + UPDATE_I=$(( ${UPDATE_I} + 1)) + done +fi +unset UPDATE_I + +LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+altgamma +curl debug dedicated openal pax_kernel +sdl server smp vorbis" +RESTRICT="mirror" + +RDEPEND=" + !dedicated? ( + virtual/opengl + curl? ( net-misc/curl ) + openal? ( media-libs/openal ) + sdl? ( media-libs/libsdl[X,sound,joystick,opengl,video] ) + !sdl? ( x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86dga + x11-libs/libXxf86vm ) + vorbis? ( media-libs/libogg + media-libs/libvorbis ) + )" +DEPEND="${RDEPEND} + app-arch/unzip + dedicated? ( curl? ( net-misc/curl ) )" + +S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${ENGINE_PV} +S_DATA=${WORKDIR}/UrbanTerror42 + +CHECKREQS_DISK_BUILD="3300M" +CHECKREQS_DISK_USR="1550M" + +pkg_pretend() { + check-reqs_pkg_pretend + + if ! use dedicated ; then + if ! use sdl && ! use openal ; then + ewarn + ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag." + ewarn + fi + fi +} + +src_unpack() { + local UPDATE_I + default + # apply updates + if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then + UPDATE_I=${UPDATE_PV:5:2} + while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do + cp -dRpf \ + "${WORKDIR}"/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$((${UPDATE_I} + 1))/* \ + "${S_DATA}"/ || die + UPDATE_I=$(( ${UPDATE_I} + 1)) + done + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.2.021-build.patch +} + +src_compile() { + buildit() { use $1 && echo 1 || echo 0 ; } + nobuildit() { use $1 && echo 0 || echo 1 ; } + + emake \ + ARCH=$(usex amd64 "x86_64" "i386") \ + DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \ + BUILD_CLIENT=$(nobuildit dedicated) \ + BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \ + BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \ + USE_SDL=$(buildit sdl) \ + USE_OPENAL=$(buildit openal) \ + USE_OPENAL_DLOPEN=0 \ + USE_CURL=$(buildit curl) \ + USE_CURL_DLOPEN=0 \ + USE_CODEC_VORBIS=$(buildit vorbis) \ + USE_ALTGAMMA=$(buildit altgamma) \ + USE_LOCAL_HEADERS=0 \ + Q="" \ + $(usex debug "debug" "release") +} + +src_install() { + local my_arch=$(usex amd64 "x86_64" "i386") + + dodoc ChangeLog README md4-readme.txt + dodoc "${S_DATA}"/q3ut4/readme42.txt + insinto "${GAMES_DATADIR}"/${PN}/q3ut4 + doins "${S_DATA}"/q3ut4/*.pk3 + + if use !dedicated ; then + newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN} + doicon -s scalable "${DISTDIR}"/${PN}.svg + make_desktop_entry ${PN} "UrbanTerror" + fi + + if use dedicated || use server ; then + newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated + docinto examples + dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt} + fi + + prepgamesdirs + + if use pax_kernel; then + pax-mark m "${D}""${GAMES_BINDIR}"/${PN} || die + fi + +} + +pkg_preinst() { + games_pkg_preinst + use dedicated || gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + use dedicated || gnome2_icon_cache_update + + if use openal && ! use dedicated ; then + einfo + elog "You might need to set:" + elog " seta s_useopenal \"1\"" + elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work." + einfo + fi +} + +pkg_postrm() { + use dedicated || gnome2_icon_cache_update +}
