* [gentoo-commits] proj/gamerlay:master commit in: profiles/, games-fps/urbanterror/, games-fps/urbanterror/files/
@ 2012-05-27 20:07 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2012-05-27 20:07 UTC (permalink / raw
To: gentoo-commits
commit: bd38b15bcdc1a74bb23d0fa1177ce7ceb7123d87
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 20:08:28 2012 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 27 20:08:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=bd38b15b
games-fps/urbanterror: Now in gx86, supposedly works there.
---
games-fps/urbanterror/files/curl_fix.patch | 17 ---
.../urbanterror-4.1.1788.210710-server-name.patch | 79 -------------
.../urbanterror-4.1.1807.251210-server-name.patch | 79 -------------
.../urbanterror/files/urbanterror-makefile.patch | 21 ----
.../urbanterror/files/urbanterror-minizip.patch | 88 ---------------
games-fps/urbanterror/metadata.xml | 5 -
.../urbanterror-4.1.1807.251210-r1.ebuild | 119 --------------------
profiles/package.mask | 5 -
8 files changed, 0 insertions(+), 413 deletions(-)
diff --git a/games-fps/urbanterror/files/curl_fix.patch b/games-fps/urbanterror/files/curl_fix.patch
deleted file mode 100644
index 99491f1..0000000
--- a/games-fps/urbanterror/files/curl_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-*** UrbanTerror/q3ut4/autoexec.cfg Sat Jan 27 13:18:18 2007
---- UrbanTerror/q3ut4/autoexecmy.cfg Sat Dec 19 11:34:43 2009
-***************
-*** 1,5 ****
-! //In this file you can do settings that will be executed everytime Urban Terror is started. It will not get overwritten.
-! //Lines starting with // are ignored.
-! //Example1: exec yourconfig.cfg
-! //Example2: set cg_fov "110"
-! //Example3: bind x ut_weaptoggle knife
-\ No newline at end of file
---- 1,6 ----
-! //In this file you can do settings that will be executed everytime Urban Terror is started. It will not get overwritten.
-! //Lines starting with // are ignored.
-! //Example1: exec yourconfig.cfg
-! //Example2: set cg_fov "110"
-! //Example3: bind x ut_weaptoggle knife
-! seta cl_cURLLib "/usr/lib/libcurl.so"
diff --git a/games-fps/urbanterror/files/urbanterror-4.1.1788.210710-server-name.patch b/games-fps/urbanterror/files/urbanterror-4.1.1788.210710-server-name.patch
deleted file mode 100644
index 1b808b6..0000000
--- a/games-fps/urbanterror/files/urbanterror-4.1.1788.210710-server-name.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- work.orig/ioq3-urt-git/ioq3-urt/code/client/cl_ui.c 2011-05-04 18:16:08.143400352 +0200
-+++ work/ioq3-urt-git/ioq3-urt/code/client/cl_ui.c 2011-05-04 18:21:32.599472560 +0200
-@@ -28,6 +28,8 @@
-
- vm_t *uivm;
-
-+static void LAN_GetServerNameStr( char *buf, netadr_t adr, int buflen );
-+
- /*
- ====================
- GetClientState
-@@ -36,7 +38,7 @@
- static void GetClientState( uiClientState_t *state ) {
- state->connectPacketCount = clc.connectPacketCount;
- state->connState = cls.state;
-- Q_strncpyz( state->servername, cls.servername, sizeof( state->servername ) );
-+ LAN_GetServerNameStr( state->servername, clc.serverAddress, sizeof( state->servername) );
- Q_strncpyz( state->updateInfoString, cls.updateInfoString, sizeof( state->updateInfoString ) );
- Q_strncpyz( state->messageString, clc.serverMessage, sizeof( state->messageString ) );
- state->clientNum = cl.snap.ps.clientNum;
-@@ -259,6 +261,48 @@
-
- /*
- ====================
-+LAN_GetServerNameStr
-+====================
-+*/
-+static void LAN_GetServerNameStrSrc( int source, netadr_t adr, char *buf, int buflen ){
-+ int count,i;
-+ serverInfo_t *servers = NULL;
-+ count = 0;
-+
-+ switch (source) {
-+ case AS_LOCAL :
-+ servers = &cls.localServers[0];
-+ count = MAX_OTHER_SERVERS;
-+ break;
-+ case AS_MPLAYER :
-+ case AS_GLOBAL :
-+ servers = &cls.globalServers[0];
-+ count = MAX_GLOBAL_SERVERS;
-+ break;
-+ case AS_FAVORITES :
-+ servers = &cls.favoriteServers[0];
-+ count = MAX_OTHER_SERVERS;
-+ break;
-+ }
-+ if (servers) {
-+ for (i = 0; i < count; i++) {
-+ if ( NET_CompareAdr (servers[i].adr, adr )){
-+ Q_strncpyz( buf, servers[i].hostName, buflen );
-+ return;
-+ }
-+ }
-+ }
-+ buf[0] = '\0';
-+}
-+
-+static void LAN_GetServerNameStr( char *buf, netadr_t adr, int buflen ){
-+ LAN_GetServerNameStrSrc( AS_LOCAL, adr, buf, buflen);
-+ LAN_GetServerNameStrSrc( AS_GLOBAL, adr, buf, buflen);
-+ LAN_GetServerNameStrSrc( AS_FAVORITES, adr, buf, buflen);
-+}
-+
-+/*
-+====================
- LAN_GetServerInfo
- ====================
- */
---- work.orig/ioq3-urt-git/ioq3-urt/code/ui/ui_public.h 2011-05-04 18:16:08.158400215 +0200
-+++ work/ioq3-urt-git/ioq3-urt/code/ui/ui_public.h 2011-05-04 18:17:00.097931413 +0200
-@@ -30,6 +30,7 @@
- int connectPacketCount;
- int clientNum;
- char servername[MAX_STRING_CHARS];
-+ char servernamestr[MAX_STRING_CHARS];
- char updateInfoString[MAX_STRING_CHARS];
- char messageString[MAX_STRING_CHARS];
- } uiClientState_t;
diff --git a/games-fps/urbanterror/files/urbanterror-4.1.1807.251210-server-name.patch b/games-fps/urbanterror/files/urbanterror-4.1.1807.251210-server-name.patch
deleted file mode 100644
index 1b808b6..0000000
--- a/games-fps/urbanterror/files/urbanterror-4.1.1807.251210-server-name.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- work.orig/ioq3-urt-git/ioq3-urt/code/client/cl_ui.c 2011-05-04 18:16:08.143400352 +0200
-+++ work/ioq3-urt-git/ioq3-urt/code/client/cl_ui.c 2011-05-04 18:21:32.599472560 +0200
-@@ -28,6 +28,8 @@
-
- vm_t *uivm;
-
-+static void LAN_GetServerNameStr( char *buf, netadr_t adr, int buflen );
-+
- /*
- ====================
- GetClientState
-@@ -36,7 +38,7 @@
- static void GetClientState( uiClientState_t *state ) {
- state->connectPacketCount = clc.connectPacketCount;
- state->connState = cls.state;
-- Q_strncpyz( state->servername, cls.servername, sizeof( state->servername ) );
-+ LAN_GetServerNameStr( state->servername, clc.serverAddress, sizeof( state->servername) );
- Q_strncpyz( state->updateInfoString, cls.updateInfoString, sizeof( state->updateInfoString ) );
- Q_strncpyz( state->messageString, clc.serverMessage, sizeof( state->messageString ) );
- state->clientNum = cl.snap.ps.clientNum;
-@@ -259,6 +261,48 @@
-
- /*
- ====================
-+LAN_GetServerNameStr
-+====================
-+*/
-+static void LAN_GetServerNameStrSrc( int source, netadr_t adr, char *buf, int buflen ){
-+ int count,i;
-+ serverInfo_t *servers = NULL;
-+ count = 0;
-+
-+ switch (source) {
-+ case AS_LOCAL :
-+ servers = &cls.localServers[0];
-+ count = MAX_OTHER_SERVERS;
-+ break;
-+ case AS_MPLAYER :
-+ case AS_GLOBAL :
-+ servers = &cls.globalServers[0];
-+ count = MAX_GLOBAL_SERVERS;
-+ break;
-+ case AS_FAVORITES :
-+ servers = &cls.favoriteServers[0];
-+ count = MAX_OTHER_SERVERS;
-+ break;
-+ }
-+ if (servers) {
-+ for (i = 0; i < count; i++) {
-+ if ( NET_CompareAdr (servers[i].adr, adr )){
-+ Q_strncpyz( buf, servers[i].hostName, buflen );
-+ return;
-+ }
-+ }
-+ }
-+ buf[0] = '\0';
-+}
-+
-+static void LAN_GetServerNameStr( char *buf, netadr_t adr, int buflen ){
-+ LAN_GetServerNameStrSrc( AS_LOCAL, adr, buf, buflen);
-+ LAN_GetServerNameStrSrc( AS_GLOBAL, adr, buf, buflen);
-+ LAN_GetServerNameStrSrc( AS_FAVORITES, adr, buf, buflen);
-+}
-+
-+/*
-+====================
- LAN_GetServerInfo
- ====================
- */
---- work.orig/ioq3-urt-git/ioq3-urt/code/ui/ui_public.h 2011-05-04 18:16:08.158400215 +0200
-+++ work/ioq3-urt-git/ioq3-urt/code/ui/ui_public.h 2011-05-04 18:17:00.097931413 +0200
-@@ -30,6 +30,7 @@
- int connectPacketCount;
- int clientNum;
- char servername[MAX_STRING_CHARS];
-+ char servernamestr[MAX_STRING_CHARS];
- char updateInfoString[MAX_STRING_CHARS];
- char messageString[MAX_STRING_CHARS];
- } uiClientState_t;
diff --git a/games-fps/urbanterror/files/urbanterror-makefile.patch b/games-fps/urbanterror/files/urbanterror-makefile.patch
deleted file mode 100644
index bb55611..0000000
--- a/games-fps/urbanterror/files/urbanterror-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- openarena-engine-0.8.1/Makefile 2008-08-09 22:22:37.000000000 +0200
-+++ openarena-engine-0.8.1/Makefile.new 2009-01-07 19:33:31.000000000 +0100
-@@ -231,8 +231,7 @@
- endif
- endif
-
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-- -pipe -DUSE_ICON $(shell sdl-config --cflags)
-+ BASE_CFLAGS = %CFLAGS% -DUSE_ICON $(shell sdl-config --cflags)
-
- ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL
-@@ -323,7 +322,7 @@
- endif
-
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
-+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG
-
- else # ifeq Linux
-
diff --git a/games-fps/urbanterror/files/urbanterror-minizip.patch b/games-fps/urbanterror/files/urbanterror-minizip.patch
deleted file mode 100644
index d241fe6..0000000
--- a/games-fps/urbanterror/files/urbanterror-minizip.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-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/metadata.xml b/games-fps/urbanterror/metadata.xml
deleted file mode 100644
index 4a5a466..0000000
--- a/games-fps/urbanterror/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>playboys</herd>
-</pkgmetadata>
diff --git a/games-fps/urbanterror/urbanterror-4.1.1807.251210-r1.ebuild b/games-fps/urbanterror/urbanterror-4.1.1807.251210-r1.ebuild
deleted file mode 100644
index 30c2ed1..0000000
--- a/games-fps/urbanterror/urbanterror-4.1.1807.251210-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils flag-o-matic games toolchain-funcs versionator
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-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://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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl openal server speex vorbis"
-
-COMMON_DEPEND="
- client? (
- media-libs/ftgl
- media-libs/freetype:1
- media-libs/libsdl[X,opengl]
- openal? ( media-libs/openal )
- vorbis? ( media-libs/libogg media-libs/libvorbis )
- )
- curl? ( net-misc/curl )
- speex? ( media-libs/speex )
- sys-libs/zlib[minizip] "
-DEPEND="${COMMON_DEPEND}
- app-arch/p7zip
- app-arch/unzip
- dev-util/pkgconfig
- media-libs/netpbm"
-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:' \
- -i Makefile || die
-
- sed -e 's:include <SDL_opengl.h>:include <SDL/SDL_opengl.h>:' \
- -i 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=i386
- 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/profiles/package.mask b/profiles/package.mask
index 63e1ffe..97a4c67 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,8 +2,3 @@
# Wait until boost-1.44, bug #320039
dev-games/gigi
games-strategy/freeorion
-
-# Michael Weber <xmw@gentoo.org> (06 May 2011)
-# crashes on escape inside game
-=games-fps/urbanterror-4.1.1807.251210
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-05-27 20:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-27 20:07 [gentoo-commits] proj/gamerlay:master commit in: profiles/, games-fps/urbanterror/, games-fps/urbanterror/files/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox