[quake3] - Update release to svn revision (r1802) - Add a whole bunch of patches from Debian which allow usin
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Nov 12 15:40:17 UTC 2010
commit 76c158bd639eced5e5224ebb0b9f3b63aafc9cbd
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Nov 12 16:41:18 2010 +0100
- Update release to svn revision (r1802)
- Add a whole bunch of patches from Debian which allow using ioquake3 as an
engine for total conversions and compability with network play with
official openarena servers (#565763)
- Remove our own hacks for ioquake3 as an engine for total conversions
quake3-1.34-dont-ask-openarena-cdkey.patch | 17 --
quake3-1.34-no-pak0-check.patch | 17 --
quake3-1.34-syslibs.patch | 417 ----------------------------
quake3-1.36-botlib-strcpy-abuse.patch | 33 ---
quake3.spec | 57 ++++-
urbanterror.sh | 21 ++-
worldofpadman.sh | 19 ++-
7 files changed, 86 insertions(+), 495 deletions(-)
---
diff --git a/quake3.spec b/quake3.spec
index d56ed2f..45363c8 100644
--- a/quake3.spec
+++ b/quake3.spec
@@ -1,6 +1,6 @@
Name: quake3
Version: 1.36
-Release: 7.svn1783%{?dist}
+Release: 8.svn1802%{?dist}
Summary: Quake 3 Arena engine (ioquake3 version)
Group: Amusements/Games
License: GPLv2+
@@ -14,7 +14,7 @@ URL: http://ioquake3.org/
# rm -fr code/tools/lcc
# popd
# tar cvfj %{name}-%{version}.tar.bz2 %{name}-%{version}
-Source0: %{name}-%{version}-svn1783.tar.bz2
+Source0: %{name}-%{version}-svn1802.tar.bz2
Source1: %{name}-demo.sh
Source2: %{name}.autodlrc
Source3: %{name}.desktop
@@ -32,10 +32,30 @@ Source14: wop.png
Source15: jpeg_memsrc.h
Source16: jpeg_memsrc.c
Patch0: quake3-1.36-syslibs.patch
-Patch2: quake3-1.34-fix-empty-fs_game-from-server.patch
-Patch3: quake3-1.34-dont-ask-openarena-cdkey.patch
-Patch4: quake3-1.34-no-pak0-check.patch
-Patch5: quake3-1.34-rc4-demo-pak.patch
+Patch1: quake3-1.34-fix-empty-fs_game-from-server.patch
+Patch2: quake3-1.34-rc4-demo-pak.patch
+# from debian don't complain about lacking original pak0 with total conversions
+# http://bugzilla.icculus.org/show_bug.cgi?id=4699
+Patch3: 0003-FS_CheckPak0-don-t-require-BASEGAME-pak0.pk3-if-fs_b.patch
+# bugfix from Debian submitted upstream:
+# http://bugzilla.icculus.org/show_bug.cgi?id=4691
+Patch4: 0004-Clip-cl_mouseAccelOffset-at-0.001-to-avoid-division-.patch
+# patches from Debian to allow reporting / accepting a different protocol
+# version, which allows the main ioquake3 to serve as a openarena
+# server / client (there are no protocol differences, yet openarena uses
+# a different protocol version to distuingish itself). Submitted upstream:
+# http://bugzilla.icculus.org/show_bug.cgi?id=4698
+Patch5: 0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
+Patch6: 0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
+Patch7: 0007-Load-demos-using-the-protocol-version-from-the-comma.patch
+# patches from Debian to allow transparent support of native compiled qvm's
+Patch8: 0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+Patch9: 0009-FS_FindDll-new-function-to-go-through-the-search-pat.patch
+Patch10: 0010-Sys_LoadDll-use-FS_FindDll.patch
+# patches from Debian for openarena compatibility (increase some buffer sizes)
+Patch11: 0011-Double-the-maximum-number-of-cvars.patch
+Patch12: 0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
+Patch13: 0013-Double-the-default-com_hunkMegs-to-128M.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel libXt-devel openal-soft-devel libjpeg-devel
BuildRequires: speex-devel libvorbis-devel curl-devel desktop-file-utils
@@ -75,7 +95,8 @@ engine, below is an (incomplete list):
%package demo
Summary: Quake 3 Arena tournament 3D shooter game demo installer
Group: Amusements/Games
-Requires: quake3 hicolor-icon-theme opengl-games-utils unzip
+Requires: quake3 = %{version}-%{release}
+Requires: hicolor-icon-theme opengl-games-utils unzip
# quake3-demo used to be part of the quake3 package, make sure that people
# who have the old version with the demo included don't all of a sudden have
# the demo menu entry disappear.
@@ -96,7 +117,8 @@ install the Quake 3 demo datafiles for you.
Summary: FPS best be described as a Hollywood tactical shooter
Group: Amusements/Games
URL: http://www.urbanterror.net/
-Requires: quake3 hicolor-icon-theme opengl-games-utils unzip
+Requires: quake3 = %{version}-%{release}
+Requires: hicolor-icon-theme opengl-games-utils unzip
%description -n urbanterror
Urban Terror could best be described as a Hollywood tactical shooter; it is
@@ -115,7 +137,8 @@ Terror menu entry, which will automatically download the necessary datafiles
Summary: World Of Padman - Comic 3D-Shooter
Group: Amusements/Games
URL: http://padworld.myexp.de/
-Requires: quake3 hicolor-icon-theme opengl-games-utils tar gzip
+Requires: quake3 = %{version}-%{release}
+Requires: hicolor-icon-theme opengl-games-utils tar gzip
%description -n worldofpadman
World of Padman (WoP) is a first-person shooter computer game available in
@@ -133,10 +156,19 @@ Padman menu entry, which will automatically download the necessary datafiles
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
# Add jpeg_memsrc
cp -p %{SOURCE15} %{SOURCE16} ./code/renderer/
@@ -272,6 +304,13 @@ fi
%changelog
+* Thu Nov 11 2010 Hans de Goede <hdegoede at redhat.com> 1.36-8.svn1802
+- Update release to svn revision (r1802)
+- Add a whole bunch of patches from Debian which allow using ioquake3 as an
+ engine for total conversions and compability with network play with
+ official openarena servers (#565763)
+- Remove our own hacks for ioquake3 as an engine for total conversions
+
* Wed May 12 2010 Xavier Lamien <laxathom at fedoraproject.org> - 1.36-7.svn1783
- Update release to svn revision (r1783).
- Remove botlib-strcpy-abuse patch (added upstream).
diff --git a/urbanterror.sh b/urbanterror.sh
index cb48980..3419a65 100644
--- a/urbanterror.sh
+++ b/urbanterror.sh
@@ -26,4 +26,23 @@ if [ ! -f ~/.q3a/q3ut4/zpak000.pk3 ]; then
fi
fi
-exec quake3 +set fs_game q3ut4 +set com_hunkMegs 256 +set cl_allowdownload 1 "$@"
+# We used to run from under ~/.q3a, but that is a bad idea as that will
+# cause com_standalone to get unset if regular quake3 is also present
+# So now we run from ~/.q3ut4, but we keep the data files under
+# ~/.q3a for compatibilities with older autodl "installs"
+mkdir -p $HOME/.q3ut4
+ln -f -s ../.q3a/q3ut4 $HOME/.q3ut4/q3ut4
+
+# we're a standalone game
+CVARS="+set com_standalone 1"
+CVARS="$CVARS +set fs_basegame q3ut4"
+CVARS="$CVARS +set fs_basepath /usr/share/q3ut4"
+CVARS="$CVARS +set fs_homepath \"$HOME/.q3ut4\""
+# Urban Terror's default master server is different
+CVARS="$CVARS +set sv_master1 master.urbanterror.net"
+# update.quake3arena.com is pretty irrelevant if you're playing ut
+CVARS="$CVARS +set cl_motd 0"
+# And last some Urban Terror specific settings
+CVARS="$CVARS +set com_hunkMegs 256 +set cl_allowdownload 1"
+
+exec quake3 $CVARS "$@"
diff --git a/worldofpadman.sh b/worldofpadman.sh
old mode 100644
new mode 100755
index 6169dae..f9800b5
--- a/worldofpadman.sh
+++ b/worldofpadman.sh
@@ -33,4 +33,21 @@ if [ ! -f $HOME/.q3a/wop/wop_006.pk3 ]; then
fi
fi
-exec quake3 +set fs_game wop "$@"
+# We used to run from under ~/.q3a, but that is a bad idea as that will
+# cause com_standalone to get unset if regular quake3 is also present
+# So now we run from ~/.wop, but we keep the data files under
+# ~/.q3a for compatibilities with older autodl "installs"
+mkdir -p $HOME/.wop
+ln -f -s ../.q3a/wop $HOME/.wop/wop
+
+# we're a standalone game
+CVARS="+set com_standalone 1"
+CVARS="$CVARS +set fs_basegame wop"
+CVARS="$CVARS +set fs_basepath /usr/share/wop"
+CVARS="$CVARS +set fs_homepath \"$HOME/.wop\""
+# World of Padman's default master server is different
+CVARS="$CVARS +set sv_master1 wopmaster.kickchat.com:27955"
+# update.quake3arena.com is pretty irrelevant if you're playing wop
+CVARS="$CVARS +set cl_motd 0"
+
+exec quake3 $CVARS "$@"
More information about the scm-commits
mailing list