Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Bor Kraljič (98d664764d825f0921f8ff03a804d4df1175ca6a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Bor Kraljič (98d664764d825f0921f8ff03a804d4df1175ca6a)
  • Date: Sun, 18 Sep 2011 03:55:24 -0500

GIT changes to master games grimoire by Bor Kraljič <pyrobor AT ver.si>:

dev/null |binary
games-engines/spring/BUILD | 5 -
games-engines/spring/DEPENDS | 8 +-
games-engines/spring/DETAILS | 11 +--
games-engines/spring/HISTORY | 9 ++
games-engines/spring/INSTALL | 3
games-engines/spring/PRE_BUILD | 8 --
games-engines/spring/awk_java.patch | 48 ++++++++++++++
games-engines/spring/gcc46.patch | 68
+++++++++++++++++++++
games-engines/spring/spring_0.76b1_src.tar.bz2.sig | 0
10 files changed, 138 insertions(+), 22 deletions(-)

New commits:
commit 98d664764d825f0921f8ff03a804d4df1175ca6a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

spring: updated spell to 0.82.7.1

* DETAILS: Changed SOURCE_URL[0] extension, Fixed SOURCE_URL[0]
* gcc46.patch, awk_java.patch: added patches to fix build from Arch Linux
* PRE_BUILD: removed edit of scons build system & apply the patches
* DEPENDS: updated dependencies
* BUILD: scons is history (cmake is now used)
* INSTALL: removed no longer needed (default install now works)

diff --git a/games-engines/spring/BUILD b/games-engines/spring/BUILD
index 5c2f4fe..e013b8d 100755
--- a/games-engines/spring/BUILD
+++ b/games-engines/spring/BUILD
@@ -1,4 +1 @@
-scons configure \
- prefix=$INSTALL_ROOT/usr \
- datadir=$INSTALL_ROOT/usr/share/games/spring &&
-scons
+cmake_build
diff --git a/games-engines/spring/DEPENDS b/games-engines/spring/DEPENDS
index 095841e..02dfd29 100755
--- a/games-engines/spring/DEPENDS
+++ b/games-engines/spring/DEPENDS
@@ -1,14 +1,14 @@
-depends -sub "SERIALIZATION THREAD REGEX" boost &&
+depends -sub "PROGRAM_OPTIONS THREAD REGEX SYSTEM SIGNALS" boost &&
+depends cmake &&
depends devil &&
depends freetype2 &&
depends glew &&
depends jdk6-bin '' 'z-rejected' &&
depends libogg &&
depends libvorbis &&
-depends -sub SNAPSHOT openal &&
+depends openal-soft &&
depends OPENGL &&
depends python &&
-depends scons &&
depends sdl &&
-depends zip &&
+depends p7zip &&
depends zlib
diff --git a/games-engines/spring/DETAILS b/games-engines/spring/DETAILS
index 7c4feb2..b6e0015 100755
--- a/games-engines/spring/DETAILS
+++ b/games-engines/spring/DETAILS
@@ -1,12 +1,11 @@
SPELL=spring
- VERSION=0.76b1
- PATCHLEVEL=1
- SOURCE=${SPELL}_${VERSION}_src.tar.bz2
+ VERSION=0.82.7.1
+ SOURCE=${SPELL}_${VERSION}_src.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_${VERSION}
- SOURCE_URL[0]=http://spring.clan-sy.com/dl/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+
SOURCE_URL[0]=${SOURCEFORGE_URL}/springrts/springrts/$SPELL-$VERSION/$SOURCE
+
SOURCE_HASH=sha512:aea04e42aa5c90a9b85033d904a64a6e977cf6088eb448dc5067670e864b78330ed608f0e44bda35a30ccfc9605af7c4a72f76c4b2800662d23ac8bb7a92c116
LICENSE[0]=GPL
- WEB_SITE=http://spring.clan-sy.com/
+ WEB_SITE=http://springrts.com/
ENTERED=20080105
SHORT='Open source real-time strategy engine'
DOCS="$DOCS LICENSE.html README.html"
diff --git a/games-engines/spring/HISTORY b/games-engines/spring/HISTORY
index 0b439b4..302e766 100644
--- a/games-engines/spring/HISTORY
+++ b/games-engines/spring/HISTORY
@@ -1,3 +1,12 @@
+2011-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.82.7.1
+ Changed SOURCE_URL[0] extension, Fixed SOURCE_URL[0]
+ * gcc46.patch, awk_java.patch: added patches to fix build from Arch
Linux
+ * PRE_BUILD: removed edit of scons build system & apply the patches
+ * DEPENDS: updated dependencies
+ * BUILD: scons is history (cmake is now used)
+ * INSTALL: removed no longer needed (default install now works)
+
2008-04-23 Alexander Tsamutali <astsmtl AT gmail.com>
* DEPENDS: sub-depends on openal SNAPSHOT
* BUILD: changed 'datadir' to /usr/share/games/spring
diff --git a/games-engines/spring/INSTALL b/games-engines/spring/INSTALL
deleted file mode 100755
index 3525d65..0000000
--- a/games-engines/spring/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-scons install &&
-mkdir -p $INSTALL_ROOT/etc/spring &&
-echo '$HOME/.spring' > $INSTALL_ROOT/etc/spring/datadir
diff --git a/games-engines/spring/PRE_BUILD b/games-engines/spring/PRE_BUILD
index 2e01502..113efba 100755
--- a/games-engines/spring/PRE_BUILD
+++ b/games-engines/spring/PRE_BUILD
@@ -1,5 +1,3 @@
-default_pre_build
-#
-# Find Java where we put it (nice if they allowed us to override, but
noooo...)
-#
-sedit "s:possible_dirs = \[\]:possible_dirs =
\[\"$INSTALL_ROOT/$JAVA_HOME/include\"\]:"
$SOURCE_DIRECTORY/rts/build/scons/config.py
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gcc46.patch &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/awk_java.patch
diff --git a/games-engines/spring/awk_java.patch
b/games-engines/spring/awk_java.patch
new file mode 100644
index 0000000..36c9329
--- /dev/null
+++ b/games-engines/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/games-engines/spring/gcc46.patch
b/games-engines/spring/gcc46.patch
new file mode 100644
index 0000000..026bf4d
--- /dev/null
+++ b/games-engines/spring/gcc46.patch
@@ -0,0 +1,68 @@
+From: Jan Dittberner <jandd AT 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;
+
+
diff --git a/games-engines/spring/spring_0.76b1_src.tar.bz2.sig
b/games-engines/spring/spring_0.76b1_src.tar.bz2.sig
deleted file mode 100644
index 7a668e8..0000000
Binary files a/games-engines/spring/spring_0.76b1_src.tar.bz2.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master games grimoire by Bor Kraljič (98d664764d825f0921f8ff03a804d4df1175ca6a), Bor Kraljič, 09/18/2011

Archive powered by MHonArc 2.6.24.

Top of Page