[alienarena/f14/master] 7.45
Tom Callaway
spot at fedoraproject.org
Mon Aug 2 19:11:45 UTC 2010
commit 250fd981c83991b94b3e8b391f288bbaeb2697a7
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Aug 2 15:12:12 2010 -0400
7.45
alienarena-7.45-currentdir-option.patch | 36 ++++++++++++++++++++++++
alienarena-7.45-no-qglBlitFramebufferEXT.patch | 25 ++++++++++++++++
alienarena-7.45-show-search-paths.patch | 11 +++++++
alienarena.spec | 31 ++++++++++++--------
sources | 1 +
5 files changed, 91 insertions(+), 13 deletions(-)
---
diff --git a/alienarena-7.45-currentdir-option.patch b/alienarena-7.45-currentdir-option.patch
new file mode 100644
index 0000000..470b013
--- /dev/null
+++ b/alienarena-7.45-currentdir-option.patch
@@ -0,0 +1,36 @@
+diff -up alienarena-7.45/source/Makefile.current alienarena-7.45/source/Makefile
+--- alienarena-7.45/source/Makefile.current 2010-08-02 13:49:09.000000000 -0400
++++ alienarena-7.45/source/Makefile 2010-08-02 13:52:49.636267949 -0400
+@@ -26,6 +26,8 @@ BUILD?=ALL
+ WITH_DATADIR?=no
+ WITH_LIBDIR?=no
+
++WITH_CURRENTDIR?=yes
++
+ # End of configurable options.
+
+ VERSION= 1.40
+@@ -68,6 +70,10 @@ LIBDIR?=$(PREFIX)/lib/alienarena
+ BASE_CFLAGS+=-DLIBDIR='\"$(LIBDIR)\"'
+ endif
+
++ifeq ($(strip $(WITH_CURRENTDIR)),yes)
++BASE_CFLAGS+=-DCURRENTDIR='\".\"'
++endif
++
+ RELEASE_CFLAGS=$(BASE_CFLAGS)
+
+ ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
+diff -up alienarena-7.45/source/qcommon/files.c.current alienarena-7.45/source/qcommon/files.c
+--- alienarena-7.45/source/qcommon/files.c.current 2010-08-02 13:49:03.000000000 -0400
++++ alienarena-7.45/source/qcommon/files.c 2010-08-02 13:53:13.371270066 -0400
+@@ -727,7 +727,9 @@ void FS_SetGamedir (char *dir)
+ #ifdef LIBDIR
+ FS_AddGameDirectory (va("%s/%s", LIBDIR, dir) );
+ #endif
++#ifdef CURRENTDIR
+ FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) );
++#endif
+ #ifdef __unix__
+ FS_AddHomeAsGameDirectory(dir);
+ #endif
diff --git a/alienarena-7.45-no-qglBlitFramebufferEXT.patch b/alienarena-7.45-no-qglBlitFramebufferEXT.patch
new file mode 100644
index 0000000..452cfdd
--- /dev/null
+++ b/alienarena-7.45-no-qglBlitFramebufferEXT.patch
@@ -0,0 +1,25 @@
+diff -up alienarena-7.45/source/ref_gl/r_shadowmaps.c.BAD alienarena-7.45/source/ref_gl/r_shadowmaps.c
+--- alienarena-7.45/source/ref_gl/r_shadowmaps.c.BAD 2010-08-02 14:46:28.251171881 -0400
++++ alienarena-7.45/source/ref_gl/r_shadowmaps.c 2010-08-02 14:46:54.482305473 -0400
+@@ -128,14 +128,14 @@ void generateShadowFBO()
+ //FBO for capturing stencil volumes
+
+ //must check for abilit to blit(Many old ATI drivers do not support)
+- if(gl_state.hasFBOblit) {
+- if(!qglBlitFramebufferEXT) {
+- Com_Printf("qglBlitFramebufferEXT not found...\n");
++ // if(gl_state.hasFBOblit) {
++ // if(!qglBlitFramebufferEXT) {
++ // Com_Printf("qglBlitFramebufferEXT not found...\n");
+ //no point in continuing on
+- gl_state.hasFBOblit = false;
+- return;
+- }
+- }
++ // gl_state.hasFBOblit = false;
++ // return;
++ // }
++ // }
+
+ qglBindTexture(GL_TEXTURE_2D, r_colorbuffer->texnum);
+ qglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, vid.width, vid.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
diff --git a/alienarena-7.45-show-search-paths.patch b/alienarena-7.45-show-search-paths.patch
new file mode 100644
index 0000000..3cb6550
--- /dev/null
+++ b/alienarena-7.45-show-search-paths.patch
@@ -0,0 +1,11 @@
+diff -up alienarena-7.45/source/qcommon/files.c.orig alienarena-7.45/source/qcommon/files.c
+--- alienarena-7.45/source/qcommon/files.c.orig 2010-08-02 13:54:05.000000000 -0400
++++ alienarena-7.45/source/qcommon/files.c 2010-08-02 13:55:13.875144792 -0400
+@@ -542,6 +542,7 @@ void FS_AddGameDirectory (char *dir)
+ #else
+ strcpy (search->filename, dir);
+ #endif
++ Com_Printf("added %s to search paths\n", search->filename);
+ search->next = fs_searchpaths;
+ fs_searchpaths = search;
+
diff --git a/alienarena.spec b/alienarena.spec
index b66c8f5..d1195b8 100644
--- a/alienarena.spec
+++ b/alienarena.spec
@@ -1,32 +1,33 @@
Name: alienarena
Summary: Multiplayer retro sci-fi deathmatch game
-Version: 7.40
-Release: 2%{?dist}
+Version: 7.45
+Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
# Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date
# Upstream seems too inept to provide a simple source only tarball, so we use svn.
# Trunk contains the huge data also, so for the exe just get the source dir.
-# mkdir alienarena-7.40 && cd alienarena-7.40/
-# svn co svn://svn.icculus.org/alienarena/tags/7.40/source
-# svn co svn://svn.icculus.org/alienarena/tags/7.40/docs
+# mkdir alienarena-7.45 && cd alienarena-7.45/
+# svn co svn://svn.icculus.org/alienarena/tags/7.45/source
+# svn co svn://svn.icculus.org/alienarena/tags/7.45/docs
# cd ../
-# find alienarena-7.40 -depth -name .svn -type d -exec rm -rf {} \;
-# tar -cvjf alienarena-7.40.tar.bz2 alienarena-7.40
+# find alienarena-7.45 -depth -name .svn -type d -exec rm -rf {} \;
+# tar -cvjf alienarena-7.45.tar.bz2 alienarena-7.45
Source0: alienarena-%{version}.tar.bz2
Source1: alienarena.desktop
Source2: GPL.acebot.txt
Source3: alienarena.png
-Patch0: alienarena-7.20-currentdir-option.patch
+Patch0: alienarena-7.45-currentdir-option.patch
Patch1: alienarena-7.10-dont-search-dll-in-data-path.patch
-Patch3: alienarena-7.21-show-search-paths.patch
+Patch2: alienarena-7.45-show-search-paths.patch
+Patch3: alienarena-7.45-no-qglBlitFramebufferEXT.patch
URL: http://red.planetarena.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel, libjpeg-devel
BuildRequires: mesa-libGL-devel, mesa-libGLU-devel, curl-devel, libpng-devel
BuildRequires: libvorbis-devel, openal-soft-devel
BuildRequires: desktop-file-utils
-Requires: alienarena-data = 20100715
+Requires: alienarena-data = 20100802
Requires: desktop-file-utils >= 0.9, opengl-games-utils
Requires: openal-soft%{?_isa}
@@ -39,7 +40,7 @@ of play, loads of mutators, built-in bots, multiple player characters and weapon
%package server
Group: Amusements/Games
Summary: Dedicated server for alienarena, the FPS game
-Requires: alienarena-data = 20100715
+Requires: alienarena-data = 20100802
%description server
@@ -54,9 +55,10 @@ This is the dedicated server.
%setup -q
# WITH_CURRENTDIR helps a little bit, but is not a proper fix
-%patch0 -p0
+%patch0 -p1 -b .current
%patch1 -p1
-%patch3 -p1
+%patch2 -p1
+%patch3 -p1 -b .no-qglBlitFramebufferEXT
# Copy license clarification for acebot
cp -p %{SOURCE2} .
@@ -152,6 +154,9 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
%changelog
+* Mon Aug 2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 7.45-1
+- update to 7.45
+
* Thu Jul 15 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 7.40-2
- add hard dependency on openal-soft (bz 597684)
diff --git a/sources b/sources
index 04b987c..ad3b6cf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
bbc79d5cc88901fb7097d91f16aedb78 alienarena-7.40.tar.bz2
+5487efea9af6f94ef0cb56d6e98ac244 alienarena-7.45.tar.bz2
More information about the scm-commits
mailing list