summaryrefslogtreecommitdiff
path: root/community-testing/spring
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-06-06 14:37:09 +0000
committerParabola <dev@list.parabolagnulinux.org>2011-06-06 14:37:09 +0000
commitc81b3455112a3b09a8341fc8c45a91bd92c15a12 (patch)
tree93c34f7cbae7441700884513f0e5ebcec9c5f512 /community-testing/spring
parent3695b5d62c2aef6e82abc95d775a2ebd89bce081 (diff)
Mon Jun 6 14:37:05 UTC 2011
Diffstat (limited to 'community-testing/spring')
-rw-r--r--community-testing/spring/PKGBUILD45
-rw-r--r--community-testing/spring/gcc46.patch67
2 files changed, 0 insertions, 112 deletions
diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD
deleted file mode 100644
index 38ce61979..000000000
--- a/community-testing/spring/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z 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=4
-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' 'python' 'java-environment')
-optdepends=('python: python-based bots'
- 'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
- gcc46.patch)
-md5sums=('378cf0b18a5dd5b840964e5945778503'
- 'e9586b611db1ed04fe4f0c5982fda7d2')
-
-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
- 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-testing/spring/gcc46.patch b/community-testing/spring/gcc46.patch
deleted file mode 100644
index 4f6865cac..000000000
--- a/community-testing/spring/gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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;
-