diff options
author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
commit | 0aa81f04b6149c3eb5faedd57512a981e6d3c624 (patch) | |
tree | 98b1d03925fafa426c20c3075d69145c8bb2f4d8 /community/spring | |
parent | b18caf89fb235f174419d578a7da0237e456ef3d (diff) | |
parent | c399070d50c89903ec1dea55aa4aa5147a367565 (diff) |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'community/spring')
-rw-r--r-- | community/spring/PKGBUILD | 11 | ||||
-rw-r--r-- | community/spring/gcc46.patch | 67 |
2 files changed, 74 insertions, 4 deletions
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 92cb5c5ed..7a32da2c9 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41178 2011-03-04 19:28:06Z svenstaro $ +# $Id: PKGBUILD 47736 2011-05-25 04:13:58Z 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=2 +pkgrel=3 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -14,8 +14,10 @@ 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) -md5sums=('378cf0b18a5dd5b840964e5945778503') +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 @@ -24,6 +26,7 @@ build() { sed -i '1i\ #include <list>' rts/lib/lobby/Connection.h + patch -Np1 < $srcdir/gcc46.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community/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; + |