Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Julien ROZO (c312faeb15c327c394a4d34325dcbcd9271400c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Julien ROZO (c312faeb15c327c394a4d34325dcbcd9271400c7)
  • Date: Thu, 19 Feb 2009 17:58:42 -0600

GIT changes to master games grimoire by Julien ROZO <julien AT rozo.org>:

dev/null |binary
games-arcade-3d/scorched3d/BUILD | 1
games-arcade-3d/scorched3d/DETAILS | 2
games-arcade-3d/scorched3d/HISTORY | 6
games-arcade-3d/scorched3d/PRE_BUILD | 5
games-arcade-3d/scorched3d/Scorched3D-41.3-src.tar.gz.sig | 0
games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig |binary
games-arcade-3d/scorched3d/scorched3d-gcc43.patch | 88
++++++++++++++
8 files changed, 101 insertions(+), 1 deletion(-)

New commits:
commit c312faeb15c327c394a4d34325dcbcd9271400c7
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

scorched3d: updated version to 42
PRE_BUILD: added, fixing source unpacking and applying gcc 4.3 patch
scorched3d-gcc43.patch: added to fix compilation issues with gcc 4.3
BUILD: adapted SOURCE_DIRECTORY

diff --git a/games-arcade-3d/scorched3d/BUILD
b/games-arcade-3d/scorched3d/BUILD
index f2438e5..79c16d1 100755
--- a/games-arcade-3d/scorched3d/BUILD
+++ b/games-arcade-3d/scorched3d/BUILD
@@ -1 +1,2 @@
+cd $SOURCE_DIRECTORY/scorched/ &&
default_games_build
diff --git a/games-arcade-3d/scorched3d/DETAILS
b/games-arcade-3d/scorched3d/DETAILS
index 6441122..b18a9a4 100755
--- a/games-arcade-3d/scorched3d/DETAILS
+++ b/games-arcade-3d/scorched3d/DETAILS
@@ -1,5 +1,5 @@
SPELL=scorched3d
- VERSION=41.3
+ VERSION=42
SOURCE=Scorched3D-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/scorched
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
diff --git a/games-arcade-3d/scorched3d/HISTORY
b/games-arcade-3d/scorched3d/HISTORY
index d99ecc3..55bbc93 100644
--- a/games-arcade-3d/scorched3d/HISTORY
+++ b/games-arcade-3d/scorched3d/HISTORY
@@ -1,3 +1,9 @@
+2009-02-19 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 42
+ * PRE_BUILD: added, fixing source unpacking and applying gcc 4.3 patch
+ * scorched3d-gcc43.patch: added to fix compilation issues with gcc 4.3
+ * BUILD: adapted SOURCE_DIRECTORY
+
2008-04-20 Alexander Tsamutali <astsmtl AT gmail.com>
* DEPENDS: Now depends on fftw

diff --git a/games-arcade-3d/scorched3d/PRE_BUILD
b/games-arcade-3d/scorched3d/PRE_BUILD
new file mode 100755
index 0000000..2819c00
--- /dev/null
+++ b/games-arcade-3d/scorched3d/PRE_BUILD
@@ -0,0 +1,5 @@
+mkdir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file &&
+cd scorched/ &&
+patch -p1 < $SPELL_DIRECTORY/scorched3d-gcc43.patch
diff --git a/games-arcade-3d/scorched3d/Scorched3D-41.3-src.tar.gz.sig
b/games-arcade-3d/scorched3d/Scorched3D-41.3-src.tar.gz.sig
deleted file mode 100644
index ffa34b3..0000000
Binary files a/games-arcade-3d/scorched3d/Scorched3D-41.3-src.tar.gz.sig and
/dev/null differ
diff --git a/games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig
b/games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig
new file mode 100644
index 0000000..a909746
Binary files /dev/null and
b/games-arcade-3d/scorched3d/Scorched3D-42-src.tar.gz.sig differ
diff --git a/games-arcade-3d/scorched3d/scorched3d-gcc43.patch
b/games-arcade-3d/scorched3d/scorched3d-gcc43.patch
new file mode 100644
index 0000000..05a7205
--- /dev/null
+++ b/games-arcade-3d/scorched3d/scorched3d-gcc43.patch
@@ -0,0 +1,88 @@
+diff -Naur scorched.orig/src/common/common/DefinesFile.h
scorched/src/common/common/DefinesFile.h
+--- scorched.orig/src/common/common/DefinesFile.h 2008-12-29
18:38:23.000000000 +0100
++++ scorched/src/common/common/DefinesFile.h 2008-12-29 18:38:23.000000000
+0100
+@@ -23,6 +23,7 @@
+
+ #include <time.h>
+ #include <string>
++#include <cstring>
+
+ namespace S3D
+ {
+diff -Naur scorched.orig/src/common/common/LoggerI.h
scorched/src/common/common/LoggerI.h
+--- scorched.orig/src/common/common/LoggerI.h 2008-12-29 18:38:23.000000000
+0100
++++ scorched/src/common/common/LoggerI.h 2008-12-29 18:38:23.000000000
+0100
+@@ -22,6 +22,7 @@
+ #define __INCLUDE_LoggerIh_INCLUDE__
+
+ #include <string>
++#include <cstring>
+
+ class GLTexture;
+ class LoggerInfo
+diff -Naur scorched.orig/src/common/common/main.h
scorched/src/common/common/main.h
+--- scorched.orig/src/common/common/main.h 2008-12-29 18:38:23.000000000
+0100
++++ scorched/src/common/common/main.h 2008-12-29 18:38:23.000000000 +0100
+@@ -20,6 +20,7 @@
+
+ #define WIN32_LEAN_AND_MEAN
+
++#include <cstdlib>
+ #include <windows.h>
+
+ #ifdef HAVE_UNISTD_H
+diff -Naur scorched.orig/src/common/common/sha2.h
scorched/src/common/common/sha2.h
+--- scorched.orig/src/common/common/sha2.h 2008-03-02 19:47:36.000000000
+0100
++++ scorched/src/common/common/sha2.h 2008-03-02 19:47:36.000000000 +0100
+@@ -45,6 +45,7 @@
+ #define __SHA2C_H__
+
+ #include <string>
++#include <cstring>
+ #include <stdexcept>
+
+ // NOTE: You may need to define things by hand for your system:
+diff -Naur scorched.orig/src/common/lang/LangParam.cpp
scorched/src/common/lang/LangParam.cpp
+--- scorched.orig/src/common/lang/LangParam.cpp 2008-12-29
18:38:23.000000000 +0100
++++ scorched/src/common/lang/LangParam.cpp 2008-12-29 18:38:23.000000000
+0100
+@@ -18,6 +18,7 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+
////////////////////////////////////////////////////////////////////////////////
+
++#include <cstdlib>
+ #include <lang/LangParam.h>
+ #include <common/DefinesString.h>
+
+diff -Naur scorched.orig/src/common/lang/ResourceBundle.h
scorched/src/common/lang/ResourceBundle.h
+--- scorched.orig/src/common/lang/ResourceBundle.h 2008-12-29
18:38:23.000000000 +0100
++++ scorched/src/common/lang/ResourceBundle.h 2008-12-29 18:38:23.000000000
+0100
+@@ -21,6 +21,7 @@
+ #if !defined(__INCLUDE_ResourceBundle_INCLUDE__)
+ #define __INCLUDE_ResourceBundle_INCLUDE__
+
++#include <cstring>
+ #include <set>
+ #include <lang/ResourceBundleEntry.h>
+
+diff -Naur scorched.orig/src/common/landscapemap/HeightMapModifier.h
scorched/src/common/landscapemap/HeightMapModifier.h
+--- scorched.orig/src/common/landscapemap/HeightMapModifier.h 2008-12-29
18:38:23.000000000 +0100
++++ scorched/src/common/landscapemap/HeightMapModifier.h 2008-12-29
18:38:23.000000000 +0100
+@@ -21,6 +21,7 @@
+ #if
!defined(AFX_HEIGHTMAPMODIFIER_H__26733049_91D4_4AB9_8870_1BC94F531E9A__INCLUDED_)
+ #define
AFX_HEIGHTMAPMODIFIER_H__26733049_91D4_4AB9_8870_1BC94F531E9A__INCLUDED_
+
++#include <limits.h>
+ #include <common/RandomGenerator.h>
+ #include <common/FixedVector.h>
+ #include <landscapemap/HeightMap.h>
+diff -Naur scorched.orig/src/client/console/ConsoleImpl.h
scorched/src/client/console/ConsoleImpl.h
+--- scorched.orig/src/client/console/ConsoleImpl.h 2008-12-29
18:38:23.000000000 +0100
++++ scorched/src/client/console/ConsoleImpl.h 2008-12-29 18:38:23.000000000
+0100
+@@ -21,6 +21,7 @@
+ #if
!defined(AFX_ConsoleImpl_H__516D85F7_420B_43EB_B0BE_563DCBE1B143__INCLUDED_)
+ #define AFX_ConsoleImpl_H__516D85F7_420B_43EB_B0BE_563DCBE1B143__INCLUDED_
+
++#include <limits.h>
+ #include <common/LoggerI.h>
+ #include <engine/GameStateI.h>
+ #include <GLEXT/GLFont2d.h>



  • [SM-Commit] GIT changes to master games grimoire by Julien ROZO (c312faeb15c327c394a4d34325dcbcd9271400c7), Julien ROZO, 02/19/2009

Archive powered by MHonArc 2.6.24.

Top of Page