Sat Sep 17 23:14:43 UTC 2011

3 files changed, 163 insertions, 0 deletions

diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD
new file mode 100644
index 000000000..8b223fccc
--- /dev/null
+++ b/community-staging/spring/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 55657 2011-09-17 02:44:18Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=0.82.7.1
+pkgrel=7
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('i686' 'x86_64')
+url="http://springrts.com/"
+license=('GPL')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
+makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
+optdepends=('python2: python-based bots'
+            'java-runtime: java-based bots')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+        gcc46.patch
+        awk-java.patch)
+md5sums=('378cf0b18a5dd5b840964e5945778503'
+         'e9586b611db1ed04fe4f0c5982fda7d2'
+         'cd94edf21e49ff6ff7d256442ed9aa3c')
+
+build() {
+  bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+  
+  cd spring_$pkgver
+  
+  sed -i '1i\
+	  #include <list>' rts/lib/lobby/Connection.h
+  patch -Np1 < $srcdir/gcc46.patch
+  patch -Np1 < $srcdir/awk-java.patch
+  cmake	. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+	-DDATADIR=share/spring
+  make
+}
+
+package() {
+  cd spring_$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  install -d $pkgdir/etc/spring
+  echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
+}
+
+# vim sw=2:ts=2 et:
diff --git a/community-staging/spring/awk-java.patch b/community-staging/spring/awk-java.patch
new file mode 100644
index 000000000..36c932924
--- /dev/null
+++ b/community-staging/spring/awk-java.patch
@@ -0,0 +1,48 @@
+diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk
+--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:29:16.623158278 +0200
++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-07-26 17:33:00.872921328 +0200
+@@ -341,7 +341,7 @@
+ }
+ 
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+ 
+ 	isInsideCmdStruct = 1;
+ 	ind_cmdMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk
+--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:29:16.623158278 +0200
++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-07-26 17:32:51.009745026 +0200
+@@ -473,7 +473,7 @@
+ }
+ 
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+ 
+ 	isInsideEvtStruct = 1;
+ 	ind_evtMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk
+--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:29:16.626491558 +0200
++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-07-26 17:30:25.695391913 +0200
+@@ -387,7 +387,7 @@
+ }
+ 
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+ 
+ 	isInsideCmdStruct = 1;
+ 	ind_cmdMember = 0;
+diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk
+--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:29:16.626491558 +0200
++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-07-26 17:30:13.942245701 +0200
+@@ -366,7 +366,7 @@
+ }
+ 
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+ 
+ 	isInsideEvtStruct = 1;
+ 	ind_evtMember = 0;
diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch
new file mode 100644
index 000000000..4f6865cac
--- /dev/null
+++ b/community-staging/spring/gcc46.patch
@@ -0,0 +1,67 @@
+From: Jan Dittberner <jandd@debian.org>
+Subject: Patch for FTBFS with g++ 4.6.0
+Bug-Debian: http://bugs.debian.org/625097
+Bug: http://springrts.com/mantis/view.php?id=2415
+--- a/AI/Skirmish/E323AI/AAStar.h
++++ b/AI/Skirmish/E323AI/AAStar.h
+@@ -4,6 +4,7 @@
+ #include <queue>
+ #include <vector>
+ #include <list>
++#include <cstddef> // for NULL
+ 
+ class AAStar {
+ 	public:
+--- a/rts/Rendering/ShadowHandler.cpp
++++ b/rts/Rendering/ShadowHandler.cpp
+@@ -318,6 +318,11 @@
+ 	xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1))));
+ 	ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1))));
+ 
++	shadowParams.x = xmid;
++	shadowParams.y = ymid;
++	shadowParams.z = p17;
++	shadowParams.w = p18;
++
+ 	shadowMatrix[ 0] =   cross1.x / maxLengthX;
+ 	shadowMatrix[ 4] =   cross1.y / maxLengthX;
+ 	shadowMatrix[ 8] =   cross1.z / maxLengthX;
+--- a/rts/Rendering/ShadowHandler.h
++++ b/rts/Rendering/ShadowHandler.h
+@@ -38,7 +38,7 @@
+ 	CMatrix44f shadowMatrix;
+ 	void CalcMinMaxView(void);
+ 
+-	const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); }
++	const float4& GetShadowParams() const { return shadowParams; }
+ 
+ 	enum ShadowGenProgram {
+ 		SHADOWGEN_PROGRAM_MODEL      = 0,
+@@ -76,6 +76,7 @@
+ 	//! to write the (FBO) depth-buffer texture
+ 	std::vector<Shader::IProgramObject*> shadowGenProgs;
+ 
++	float4 shadowParams;
+ 	float x1, x2, y1, y2;
+ 	float xmid, ymid;
+ 	float p17, p18;
+--- a/rts/Rendering/GLContext.cpp
++++ b/rts/Rendering/GLContext.cpp
+@@ -9,6 +9,7 @@
+ #include "GLContext.h"
+ 
+ #include <list>
++#include <cstddef>  // for NULL
+ 
+ 
+ using namespace std;
+--- a/rts/System/MemPool.h
++++ b/rts/System/MemPool.h
+@@ -4,6 +4,7 @@
+ #define _MEM_POOL_H_
+ 
+ #include <new>
++#include <cstddef> // for NULL
+ 
+ const size_t MAX_MEM_SIZE=200;
+