[gentoo-commits] proj/gamerlay:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/

[Marcel Unbehaun]

commit:     4163ce9644bca8007f049d1c49331a41fb5965f4
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sat Mar  3 13:09:37 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sat Mar  3 13:09:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4163ce96

[games-fps/urbanterror]		updated to urbanterror-4.1.1807.251210-r1.ebuild

---
 .../urbanterror/files/urbanterror-minizip.patch    |   88 ++++++++++++++++
 .../urbanterror/urbanterror-4.1.1783.240410.ebuild |  109 --------------------
 .../urbanterror/urbanterror-4.1.1788.210710.ebuild |  103 ------------------
 ...build => urbanterror-4.1.1807.251210-r1.ebuild} |   17 ++-
 games-fps/urbanterror/urbanterror-4.1.ebuild       |   98 ------------------
 5 files changed, 99 insertions(+), 316 deletions(-)

diff --git a/games-fps/urbanterror/files/urbanterror-minizip.patch b/games-fps/urbanterror/files/urbanterror-minizip.patch
new file mode 100644
index 0000000..d241fe6
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-minizip.patch
@@ -0,0 +1,88 @@
+diff -Naur ioquake3-o/code/qcommon/files.c ioquake3/code/qcommon/files.c
+--- ioquake3-o/code/qcommon/files.c	2012-03-03 13:50:33.000000000 +0100
++++ ioquake3/code/qcommon/files.c	2012-03-03 13:54:20.239874028 +0100
+@@ -31,7 +31,7 @@
+ 
+ #include "q_shared.h"
+ #include "qcommon.h"
+-#include "unzip.h"
++#include <minizip/unzip.h>
+ 
+ extern cvar_t *com_quiet;
+ 
+diff -Naur ioquake3-o/Makefile ioquake3/Makefile
+--- ioquake3-o/Makefile	2012-03-03 13:50:33.000000000 +0100
++++ ioquake3/Makefile	2012-03-03 13:52:51.139874638 +0100
+@@ -385,9 +385,9 @@
+     endif
+   endif
+ 
+-  ifeq ($(USE_CODEC_VORBIS),1)
++#  ifeq ($(USE_CODEC_VORBIS),1)
+     CLIENT_LIBS += -lvorbisfile -lvorbis -logg
+-  endif
++#  endif
+ 
+   ifeq ($(USE_MUMBLE),1)
+     CLIENT_LIBS += -lrt
+@@ -1001,7 +1001,7 @@
+ else
+   LIBS += -lz
+ endif
+-
++LIBS += -lz -lminizip
+ ifdef DEFAULT_BASEDIR
+   BASE_CFLAGS += -DDEFAULT_BASEDIR=\\\"$(DEFAULT_BASEDIR)\\\"
+ endif
+@@ -1498,8 +1498,6 @@
+   $(B)/client/q_math.o \
+   $(B)/client/q_shared.o \
+   \
+-  $(B)/client/unzip.o \
+-  $(B)/client/ioapi.o \
+   $(B)/client/puff.o \
+   $(B)/client/vm.o \
+   $(B)/client/vm_interpreted.o \
+@@ -1666,16 +1664,6 @@
+ endif
+ endif
+ 
+-ifeq ($(USE_INTERNAL_ZLIB),1)
+-Q3OBJ += \
+-  $(B)/client/adler32.o \
+-  $(B)/client/crc32.o \
+-  $(B)/client/inffast.o \
+-  $(B)/client/inflate.o \
+-  $(B)/client/inftrees.o \
+-  $(B)/client/zutil.o
+-endif
+-
+ ifeq ($(HAVE_VM_COMPILED),true)
+   ifeq ($(ARCH),i386)
+     Q3OBJ += $(B)/client/vm_x86.o
+@@ -1790,8 +1778,6 @@
+   $(B)/ded/q_math.o \
+   $(B)/ded/q_shared.o \
+   \
+-  $(B)/ded/unzip.o \
+-  $(B)/ded/ioapi.o \
+   $(B)/ded/vm.o \
+   $(B)/ded/vm_interpreted.o \
+   \
+@@ -1844,16 +1830,6 @@
+       $(B)/ded/matha.o
+ endif
+ 
+-ifeq ($(USE_INTERNAL_ZLIB),1)
+-Q3DOBJ += \
+-  $(B)/ded/adler32.o \
+-  $(B)/ded/crc32.o \
+-  $(B)/ded/inffast.o \
+-  $(B)/ded/inflate.o \
+-  $(B)/ded/inftrees.o \
+-  $(B)/ded/zutil.o
+-endif
+-
+ ifeq ($(HAVE_VM_COMPILED),true)
+   ifeq ($(ARCH),i386)
+     Q3DOBJ += $(B)/ded/vm_x86.o

diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
deleted file mode 100644
index 5e93352..0000000
--- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils games toolchain-funcs versionator
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.net/
-	  http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for_urt"
-MY_VER=$(get_version_component_range 1)$(get_version_component_range 2)
-SRC_URI="http://www0.org/urt/ioq3-$(get_version_component_range 3)-urt-git-$(get_version_component_range 4).tar.7z
-	ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_VER}_FULL.zip
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl openal server speex vorbis"
-
-COMMON_DEPEND="
-	client? (
-		media-libs/libsdl[X,opengl]
-		openal? ( media-libs/openal )
-		vorbis? ( media-libs/libogg media-libs/libvorbis )
-	)
-	curl? ( net-misc/curl )
-	speex? ( media-libs/speex ) "
-DEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	app-arch/unzip
-	dev-util/pkgconfig
-	media-libs/netpbm"
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/ioq3-urt-git/ioq3-urt
-
-src_unpack() {
-	unpack ${A}
-	unpack ./ioq3-urt-git.tar
-}
-
-src_prepare() {
-	einfo "remove bundled include files"
-	rm -rf code/{SDL12,libs/win{32,64}} || die
-	#rm -rf code/{AL,SDL12,jpeg-6b,libcurl,libs/win{32,64},zlib} || die
-
-	#oq3-urt-git/ioq3-urt/Makefile
-	sed -i -e 's:include <SDL_opengl.h>:include <SDL/SDL_opengl.h>:' code/renderer/qgl.h || die
-
-	# fix case sensitivity and remove shipped binaries
-	local my_utdir=${WORKDIR}/UrbanTerror
-	mv "${my_utdir}/q3ut4/demos/tutorial.dm_68" "${my_utdir}/q3ut4/demos/TUTORIAL.dm_68" || die
-	rm -f "${my_utdir}"/io{UrbanTerror,UrTded,}.{exe,i386,x86_64} || die
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	emake \
-		$(use amd64 && echo ARCH=x86_64 || echo ARCH=i386) \
-		BUILD_SERVER=$(buildit server) \
-		BUILD_CLIENT=$(buildit client) \
-		BUILD_CLIENT_SMP=$(buildit client) \
-		CC="$(tc-getCC)" \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_OPENAL=$(buildit openal) \
-		USE_CURL=$(buildit curl) \
-		USE_VOIP=$(buildit speex) \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_LOCAL_HEADERS=0 \
-		release || die
-	#BASE_CFLAGS="${CFLAGS} -DUSE_ICON -DPRODUCT_VERSION=\\\"$(VERSION)\\\"" \
-}
-
-src_install() {
-	local my_arch=x86
-	use amd64 && my_arch=x86_64
-
-	if use client || use server ; then # just kidding
-		insinto /usr/share/pixmaps
-		doins "${DISTDIR}"/${PN}.svg || die
-	fi
-
-	if use client ; then
-		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN} || die
-		make_desktop_entry ${PN} "UrbanTerror" ${PN}
-	fi
-
-	if use server ; then
-			newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN}-dedicated || die
-			make_desktop_entry ${PN}-dedicated "UrbanTerror dedicated" ${PN}
-
-			insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-			doins dedicated.cfg || die
-	fi
-
-	dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt || die
-
-	cd "${WORKDIR}"/UrbanTerror/q3ut4 || die
-
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screenshots/ || die
-
-	prepgamesdirs
-}

diff --git a/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild b/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
deleted file mode 100644
index 56a2033..0000000
--- a/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils games toolchain-funcs versionator
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.net/
-	  http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for_urt"
-MY_VER=$(get_version_component_range 1)$(get_version_component_range 2)
-SRC_URI="http://www0.org/urt/ioq3-$(get_version_component_range 3)-urt-git-$(get_version_component_range 4).tar.lzma
-	ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_VER}_FULL.zip
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl openal server speex vanilla vorbis"
-
-COMMON_DEPEND="
-	client? (
-		media-libs/libsdl[X,opengl]
-		openal? ( media-libs/openal )
-		vorbis? ( media-libs/libogg media-libs/libvorbis )
-	)
-	curl? ( net-misc/curl )
-	speex? ( media-libs/speex ) "
-DEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	app-arch/unzip
-	dev-util/pkgconfig
-	media-libs/netpbm"
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/ioq3-urt-git/ioq3-urt
-
-src_prepare() {
-	use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch
-
-	rm -rf code/{SDL12,libs/win{32,64}} || die
-
-	sed -i -e 's:include <SDL_opengl.h>:include <SDL/SDL_opengl.h>:' code/renderer/qgl.h || die
-
-	# fix case sensitivity and remove shipped binaries
-	local my_utdir=${WORKDIR}/UrbanTerror
-	mv "${my_utdir}/q3ut4/demos/tutorial.dm_68" "${my_utdir}/q3ut4/demos/TUTORIAL.dm_68" || die
-	rm -f "${my_utdir}"/io{UrbanTerror,UrTded,}.{exe,i386,x86_64} || die
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	emake \
-		$(use amd64 && echo ARCH=x86_64 || echo ARCH=i386) \
-		BUILD_SERVER=$(buildit server) \
-		BUILD_CLIENT=$(buildit client) \
-		BUILD_CLIENT_SMP=$(buildit client) \
-		CC="$(tc-getCC)" \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_OPENAL=$(buildit openal) \
-		USE_CURL=$(buildit curl) \
-		USE_VOIP=$(buildit speex) \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_LOCAL_HEADERS=0 \
-		release || die
-	#BASE_CFLAGS="${CFLAGS} -DUSE_ICON -DPRODUCT_VERSION=\\\"$(VERSION)\\\"" \
-}
-
-src_install() {
-	local my_arch=x86
-	use amd64 && my_arch=x86_64
-
-	if use client || use server ; then # just kidding
-		insinto /usr/share/pixmaps
-		doins "${DISTDIR}"/${PN}.svg || die
-	fi
-
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins -r q3ut4/{glsl,textures} || die
-
-	if use client ; then
-		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN} || die
-		make_desktop_entry ${PN} "UrbanTerror" ${PN}
-	fi
-
-	if use server ; then
-		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN}-dedicated || die
-		make_desktop_entry ${PN}-dedicated "UrbanTerror dedicated" ${PN}
-		doins dedicated.cfg || die
-	fi
-
-	dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt || die
-
-	cd "${WORKDIR}"/UrbanTerror/q3ut4 || die
-
-	doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screenshots/ || die
-
-	prepgamesdirs
-}

diff --git a/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild b/games-fps/urbanterror/urbanterror-4.1.1807.251210-r1.ebuild
similarity index 88%
rename from games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
rename to games-fps/urbanterror/urbanterror-4.1.1807.251210-r1.ebuild
index 3456fe6..30c2ed1 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1807.251210-r1.ebuild
@@ -7,12 +7,11 @@ EAPI=2
 inherit eutils flag-o-matic games toolchain-funcs versionator
 
 DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.net/
-	  http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for_urt"
+HOMEPAGE="http://www.urbanterror.info/home/"
 MY_VER=$(get_version_component_range 1)$(get_version_component_range 2)
 MY_PATCH=$(get_version_component_range 3)-urt-$(get_version_component_range 4)-git-nobumpy
 SRC_URI="http://xmw.de/mirror/urbanterror/ioquake3-1807.tar.bz2
-	http://www0.org/urt/ioq3-${MY_PATCH}.tar.lzma
+	http://urban-zone.org/downloads/clients/mitsu/nobumpy/linux/ioq3-${MY_PATCH}.tar.lzma
 	ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_VER}_FULL.zip
 	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
 
@@ -30,7 +29,8 @@ COMMON_DEPEND="
 		vorbis? ( media-libs/libogg media-libs/libvorbis )
 	)
 	curl? ( net-misc/curl )
-	speex? ( media-libs/speex ) "
+	speex? ( media-libs/speex )
+	sys-libs/zlib[minizip] "
 DEPEND="${COMMON_DEPEND}
 	app-arch/p7zip
 	app-arch/unzip
@@ -41,9 +41,14 @@ RDEPEND="${COMMON_DEPEND}"
 S=${WORKDIR}/ioquake3
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-minizip.patch
 	epatch "${WORKDIR}"/ioq3-${MY_PATCH}.patch
 	use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch
-
+	rm -rf code/zlib || die
+	rm code/qcommon/unzip.c  || die
+	rm code/qcommon/unzip.h  || die
+	rm code/qcommon/ioapi.c  || die
+	rm code/qcommon/ioapi.h  || die	
 	rm -rf code/{FTGL,FT2,SDL12,libs/win{32,64}} || die
 
 	sed -e '/SDL_CFLAGS=/s:--cflags sdl:--cflags freetype2 sdl:' \
@@ -81,7 +86,7 @@ src_compile() {
 }
 
 src_install() {
-	local my_arch=x86
+	local my_arch=i386
 	use amd64 && my_arch=x86_64
 
 	if use client || use server ; then # just kidding

diff --git a/games-fps/urbanterror/urbanterror-4.1.ebuild b/games-fps/urbanterror/urbanterror-4.1.ebuild
deleted file mode 100644
index 6bd733d..0000000
--- a/games-fps/urbanterror/urbanterror-4.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit games toolchain-funcs
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.net/"
-SRC_URI="ftp://ftp.snt.utwente.nl/pub/games/${PN}/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip
-	ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${PV/./}_FULL.zip
-	http://files.uaaportal.com/gamefiles/current-version/UrbanTerror_${PV/./}_FULL.zip
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="dedicated openal vorbis"
-
-RDEPEND="net-misc/curl
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	openal? ( media-libs/openal )
-	!dedicated? ( media-libs/libsdl[X,opengl] )
-	dedicated? ( media-libs/libsdl )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	if ! use dedicated ; then
-		cd "${S}"/ioUrbanTerrorClientSource
-		sed -i \
-			-e '16s/-Werror //' \
-			code/tools/asm/Makefile || die "sed failed"
-		emake \
-			$(use amd64 && echo ARCH=x86_64) \
-			BUILD_CLIENT_SMP=1 \
-			BUILD_GAME_SO=0 \
-			BUILD_GAME_QVM=0 \
-			CC="$(tc-getCC)" \
-			DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-			USE_CODEC_VORBIS=$(buildit vorbis) \
-			USE_OPENAL=$(buildit openal) \
-			USE_CURL=1 \
-			USE_LOCAL_HEADERS=0 \
-				|| die "emake client failed"
-	fi
-	# allways build server
-	cd "${S}"/ioUrbanTerrorServerSource
-	emake \
-		$(use amd64 && echo ARCH=x86_64) \
-		BUILD_GAME_SO=0 \
-		BUILD_GAME_QVM=0 \
-		CC="$(tc-getCC)" \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_OPENAL=$(buildit openal) \
-		USE_CURL=1 \
-		USE_LOCAL_HEADERS=0 \
-			|| die "emake server failed"
-}
-
-src_install() {
-	use amd64 && ARCH=x86_64
-	use x86 && ARCH=x86
-
-	if ! use dedicated ; then
-			newgamesbin \
-				ioUrbanTerrorClientSource/build/release-linux-${ARCH}/ioUrbanTerror-smp.${ARCH} \
-				${PN}
-			make_desktop_entry ${PN} "UrbanTerror" Urbanterror.svg
-	fi
-	newgamesbin \
-		ioUrbanTerrorServerSource/build/release-linux-${ARCH}/ioUrTded.${ARCH} \
-		${PN}-server
-	make_desktop_entry ${PN}-server "UrbanTerror Server" Urbanterror.svg
-
-	doicon "${DISTDIR}"/Urbanterror.svg
-	cd "${S}"/UrbanTerror/q3ut4
-	dodoc readme41.txt || die "dodoc failed"
-
-	# fix case sensitivity
-	mv demos/tutorial.dm_68 demos/TUTORIAL.dm_68 || die "mv failed"
-
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screenshots server.cfg || die "doins failed"
-
-	prepgamesdirs
-}