From: "Michael Weber" <xmw@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gamerlay:master commit in: profiles/, games-fps/urbanterror/
Date: Fri, 6 May 2011 14:02:25 +0000 (UTC) [thread overview]
Message-ID: <9c10453e479816a0fd962e4c8930cd6dfad81eea.xmw@gentoo> (raw)
commit: 9c10453e479816a0fd962e4c8930cd6dfad81eea
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Fri May 6 11:43:45 2011 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri May 6 11:43:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=9c10453e
[games-fps/urbanterror] fixed src_uri, new versions
---
.../urbanterror/urbanterror-4.1.1783.240410.ebuild | 5 +-
...0.ebuild => urbanterror-4.1.1788.210710.ebuild} | 29 +++++-------
...0.ebuild => urbanterror-4.1.1807.251210.ebuild} | 48 +++++++++++---------
profiles/package.mask | 4 ++
4 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
index 02ea052..5e93352 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -11,8 +11,7 @@ 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
- http://urt.hsogaming.com/mirror/currentversion/UrbanTerror_${MY_VER}_FULL.zip
- ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${MY_VER}_FULL.zip
+ 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"
diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
similarity index 79%
copy from games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
copy to games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
index 02ea052..56a2033 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
@@ -10,15 +10,14 @@ 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
- http://urt.hsogaming.com/mirror/currentversion/UrbanTerror_${MY_VER}_FULL.zip
- ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${MY_VER}_FULL.zip
+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 vorbis"
+IUSE="+client +curl openal server speex vanilla vorbis"
COMMON_DEPEND="
client? (
@@ -37,17 +36,11 @@ 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"
+ use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch
+
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
@@ -86,24 +79,24 @@ src_install() {
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}
-
- insinto "${GAMES_DATADIR}"/${PN}/q3ut4
- doins dedicated.cfg || die
+ 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
- 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.1783.240410.ebuild b/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
similarity index 68%
copy from games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
copy to games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
index 02ea052..3456fe6 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
@@ -4,15 +4,16 @@
EAPI=2
-inherit eutils games toolchain-funcs versionator
+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"
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
- http://urt.hsogaming.com/mirror/currentversion/UrbanTerror_${MY_VER}_FULL.zip
- ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${MY_VER}_FULL.zip
+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
+ 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"
@@ -22,6 +23,8 @@ 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 )
@@ -35,24 +38,24 @@ DEPEND="${COMMON_DEPEND}
media-libs/netpbm"
RDEPEND="${COMMON_DEPEND}"
-S=${WORKDIR}/ioq3-urt-git/ioq3-urt
-
-src_unpack() {
- unpack ${A}
- unpack ./ioq3-urt-git.tar
-}
+S=${WORKDIR}/ioquake3
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
+ epatch "${WORKDIR}"/ioq3-${MY_PATCH}.patch
+ use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch
+
+ rm -rf code/{FTGL,FT2,SDL12,libs/win{32,64}} || 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
+ 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
+ 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
}
@@ -86,25 +89,26 @@ src_install() {
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}
-
- insinto "${GAMES_DATADIR}"/${PN}/q3ut4
- doins dedicated.cfg || die
+ 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
- insinto "${GAMES_DATADIR}"/${PN}/q3ut4
doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screenshots/ || die
prepgamesdirs
}
+
diff --git a/profiles/package.mask b/profiles/package.mask
index 81e1014..cb845c2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -3,3 +3,7 @@
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
+
reply other threads:[~2011-05-06 14:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9c10453e479816a0fd962e4c8930cd6dfad81eea.xmw@gentoo \
--to=xmw@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox