Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5a77c3210ac0a76006976979eb31bb682c7965fd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5a77c3210ac0a76006976979eb31bb682c7965fd)
  • Date: Sat, 19 Apr 2008 19:48:48 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

graphics/blender/HISTORY | 7 ++++
graphics/blender/PRE_BUILD | 11 +++---
graphics/blender/gcc43.patch | 71
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 84 insertions(+), 5 deletions(-)

New commits:
commit 5a77c3210ac0a76006976979eb31bb682c7965fd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

blender: Fix compilation issues with GCC 4.3.0 (sent upstream)

diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index 193af03..27747f5 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,9 @@
+2008-04-19 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Fix compilation issues with GCC 4.3.0
+ Submitted upstream at
+ http://projects.blender.org/tracker/index.php?func=detail&aid=9482
+
2007-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: cleaned up, PATCHLEVEL++
* BUILD, CONFIGURE, DEPENDS: cleaned up, added ode as opt dep,
@@ -221,3 +227,4 @@

2002-10-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
* Created this spell
+
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
index fbb00ef..3f36351 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,10 +1,11 @@
default_pre_build &&
# Set Python version to the installed version, not hardcoded to 2.4
# Bug #13418
-sedit "s:2.4:$(installed_version python):" \
+sedit "s:2.4:$(installed_version python):" \
$SOURCE_DIRECTORY/config/linux2-config.py &&

-cd $SOURCE_DIRECTORY &&
-chmod 755 release/plugins/bmake &&
-cp -r source/blender/blenpluginapi release/plugins/include &&
-patch -p1 < ${SCRIPT_DIRECTORY}/blender-2.44-scriptsdir.patch
+cd $SOURCE_DIRECTORY &&
+chmod 755 release/plugins/bmake &&
+cp -r source/blender/blenpluginapi release/plugins/include &&
+patch -p1 < ${SCRIPT_DIRECTORY}/blender-2.44-scriptsdir.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/graphics/blender/gcc43.patch b/graphics/blender/gcc43.patch
new file mode 100644
index 0000000..a748b06
--- /dev/null
+++ b/graphics/blender/gcc43.patch
@@ -0,0 +1,71 @@
+diff -Naur blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp
blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp
+--- blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp 2008-04-19
17:10:04.005647128 -0700
++++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp 2008-04-19
17:22:52.032923670 -0700
+@@ -42,6 +42,8 @@
+ #include <strings.h>
+ #endif
+
++#include <cstdio>
++
+
+ // For obscure full screen mode stuuf
+ // lifted verbatim from blut.
+diff -Naur blender-2.45.orig/intern/string/STR_String.h
blender-2.45/intern/string/STR_String.h
+--- blender-2.45.orig/intern/string/STR_String.h 2008-04-19
17:10:03.994667450 -0700
++++ blender-2.45/intern/string/STR_String.h 2008-04-19 17:13:23.254673104
-0700
+@@ -47,6 +47,9 @@
+
+ #include <vector>
+ #include <limits.h>
++#include <cstring>
++#include <cstdlib>
++
+ using namespace std;
+
+
+diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_File.cpp
blender-2.45/source/blender/yafray/intern/export_File.cpp
+--- blender-2.45.orig/source/blender/yafray/intern/export_File.cpp
2008-04-19 17:10:03.940667287 -0700
++++ blender-2.45/source/blender/yafray/intern/export_File.cpp 2008-04-19
17:35:45.875893589 -0700
+@@ -1,6 +1,7 @@
+ #include "export_File.h"
+
+ #include <math.h>
++#include <cstring>
+
+ using namespace std;
+
+diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp
blender-2.45/source/blender/yafray/intern/export_Plugin.cpp
+--- blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp
2008-04-19 17:10:03.940667287 -0700
++++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp
2008-04-19 17:33:48.316644087 -0700
+@@ -1,6 +1,8 @@
+ #include "export_Plugin.h"
+
+ #include <math.h>
++#include <cstring>
++
+ using namespace std;
+
+
+diff -Naur blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp
blender-2.45/source/blender/yafray/intern/yafray_Render.cpp
+--- blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp
2008-04-19 17:10:03.939669059 -0700
++++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp
2008-04-19 17:37:16.293897581 -0700
+@@ -7,6 +7,7 @@
+ #include "yafray_Render.h"
+
+ #include <math.h>
++#include <cstring>
+
+ using namespace std;
+
+diff -Naur
blender-2.45.orig/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
+---
blender-2.45.orig/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
2008-04-19 17:10:03.980669133 -0700
++++ blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
2008-04-19 17:42:29.390648003 -0700
+@@ -32,6 +32,8 @@
+
+ #include "GPC_KeyboardDevice.h"
+
++#include <cstdlib>
++
+ /**
+ * NextFrame toggles currentTable with previousTable,
+ * and copies relevant event information from previous to current table



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (5a77c3210ac0a76006976979eb31bb682c7965fd), Eric Sandall, 04/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page