rpms/blender/devel blender-2.45-gcc43.patch, NONE, 1.1 blender.spec, 1.66, 1.67

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6446

Modified Files:
	blender.spec 
Added Files:
	blender-2.45-gcc43.patch 
Log Message:
fix gcc-4.3 issues

blender-2.45-gcc43.patch:

--- NEW FILE blender-2.45-gcc43.patch ---
diff -up blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43 blender-2.45/source/blender/yafray/intern/yafray_Render.cpp
--- blender-2.45/source/blender/yafray/intern/yafray_Render.cpp.gcc43	2007-09-18 06:58:44.000000000 +0200
+++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp	2008-01-17 20:49:05.000000000 +0100
@@ -8,6 +8,8 @@
 
 #include <math.h>
 
+#include <cstring>
+
 using namespace std;
 
 void yafrayRender_t::clearAll()
diff -up blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_File.cpp
--- blender-2.45/source/blender/yafray/intern/export_File.cpp.gcc43	2007-09-18 06:58:44.000000000 +0200
+++ blender-2.45/source/blender/yafray/intern/export_File.cpp	2008-01-17 20:49:05.000000000 +0100
@@ -2,6 +2,8 @@
 
 #include <math.h>
 
+#include <cstring>
+
 using namespace std;
 
 static string command_path = "";
diff -up blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43 blender-2.45/source/blender/yafray/intern/export_Plugin.cpp
--- blender-2.45/source/blender/yafray/intern/export_Plugin.cpp.gcc43	2007-09-18 06:58:44.000000000 +0200
+++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp	2008-01-17 20:49:05.000000000 +0100
@@ -1,6 +1,9 @@
 #include "export_Plugin.h"
 
 #include <math.h>
+
+#include <cstring>
+
 using namespace std;
 
 
diff -up blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43 blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
--- blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp.gcc43	2008-01-17 20:56:36.000000000 +0100
+++ blender-2.45/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp	2008-01-17 20:57:03.000000000 +0100
@@ -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
diff -up blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43 blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
--- blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h.gcc43	2007-09-18 06:58:17.000000000 +0200
+++ blender-2.45/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h	2008-01-17 20:49:05.000000000 +0100
@@ -56,7 +56,7 @@
 #  undef GL_ARB_vertex_program
 #endif
 
-#include "glext.h"
+// #include "glext.h"
 
 #include "EXT_separate_specular_color.h"
 #include "ARB_multitexture.h"
diff -up blender-2.45/intern/string/STR_String.h.gcc43 blender-2.45/intern/string/STR_String.h
--- blender-2.45/intern/string/STR_String.h.gcc43	2007-09-18 06:58:01.000000000 +0200
+++ blender-2.45/intern/string/STR_String.h	2008-01-17 20:49:05.000000000 +0100
@@ -47,6 +47,10 @@
 
 #include <vector>
 #include <limits.h>
+
+#include <cstring>
+#include <cstdlib>
+
 using namespace std;
 
 
diff -up blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43 blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp
--- blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp.gcc43	2007-09-18 06:57:51.000000000 +0200
+++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp	2008-01-17 20:49:05.000000000 +0100
@@ -42,6 +42,8 @@
 #include <strings.h>
 #endif
 
+#include <cstring>
+#include <cstdio>
 
 // For obscure full screen mode stuuf
 // lifted verbatim from blut.


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- blender.spec	16 Oct 2007 14:11:58 -0000	1.66
+++ blender.spec	17 Jan 2008 20:18:20 -0000	1.67
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.45
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -27,6 +27,7 @@
 
 Patch1:         blender-2.44-scons.patch
 Patch2:		blender-2.44-bid.patch
+Patch3:		blender-2.45-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +70,7 @@
 %setup -q 
 %patch1 -p1 -b .org
 %patch2 -p1 -b .bid
+%patch3 -p1 -b .gcc43
 
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -172,6 +174,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Thu Jan 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-5
+- Fix gcc-4.3 related issues
+
 * Tue Oct 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.45-4
 - Rebuild again for OpenEXR