Hello community,

here is the log from the commit of package blender for openSUSE:Factory
checked in at Mon May 2 18:22:46 CEST 2011.



--------
--- blender/blender.changes     2011-02-18 12:03:01.000000000 +0100
+++ blender/blender.changes     2011-04-28 11:58:17.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Apr 28 09:30:53 UTC 2011 - [email protected]
+
+- Add blender-2.56-gcc46.patch to fix compilation with gcc 4.6 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  blender-2.55-gcc46fix.patch

New:
----
  blender-2.56-gcc46.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.YiHRrj/_old  2011-05-02 18:19:33.000000000 +0200
+++ /var/tmp/diff_new_pack.YiHRrj/_new  2011-05-02 18:19:33.000000000 +0200
@@ -61,7 +61,7 @@
 Group:          Productivity/Graphics/3D Editors
 Summary:        A 3D Modelling And Rendering Package
 Version:        2.56.34784
-Release:        6
+Release:        7
 Url:            http://www.blender.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.xz
@@ -76,7 +76,7 @@
 Patch1:         blender-2.48-undefine-operation.patch
 # Patch submitted upstream - Blender Patches item #19234,
 Patch2:         blender-2.50-uninit-var.patch
-Patch4:         blender-2.55-gcc46fix.patch
+Patch4:         blender-2.56-gcc46.patch
 %if %DISTRIBUTABLE == 1
 # Patch3 is needed due to the purging of everything mpeg
 Patch3:         blender-2.55-blenkernel.patch
@@ -143,7 +143,7 @@
 %patch0
 %patch1
 %patch2
-%patch4
+%patch4 -p1
 
 %if %DISTRIBUTABLE == 1
 %patch3

++++++ blender-2.55-gcc46fix.patch -> blender-2.56-gcc46.patch ++++++
--- blender/blender-2.55-gcc46fix.patch 2010-12-17 00:40:12.000000000 +0100
+++ blender/blender-2.56-gcc46.patch    2011-04-28 11:58:17.000000000 +0200
@@ -1,12 +1,98 @@
-Index: extern/Eigen2/Eigen/src/Core/util/Memory.h
-===================================================================
---- extern/Eigen2/Eigen/src/Core/util/Memory.h.orig    2009-10-20 
11:50:24.000000000 +0200
-+++ extern/Eigen2/Eigen/src/Core/util/Memory.h 2010-12-17 01:36:30.000000000 
+0200
-@@ -26,6 +26,7 @@
+diff -Naur 
blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h 
blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h
+--- blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h    
2009-09-14 11:45:32.000000000 -0300
++++ 
blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h     
   2011-02-08 22:32:34.300937158 -0200
+@@ -177,6 +177,7 @@
+       /* Material             */ 
+       struct  Material : Element
+       {
++                Material (){}
+               btScalar                                m_kLST;                 
// Linear stiffness coefficient [0,1]
+               btScalar                                m_kAST;                 
// Area/Angular stiffness coefficient [0,1]
+               btScalar                                m_kVST;                 
// Volume stiffness coefficient [0,1]
+@@ -191,6 +192,7 @@
+       /* Node                 */ 
+       struct  Node : Feature
+       {
++                Node (){}
+               btVector3                               m_x;                    
// Position
+               btVector3                               m_q;                    
// Previous step position
+               btVector3                               m_v;                    
// Velocity
+@@ -204,6 +206,7 @@
+       /* Link                 */ 
+       struct  Link : Feature
+       {
++                Link (){}
+               Node*                                   m_n[2];                 
// Node pointers
+               btScalar                                m_rl;                   
// Rest length          
+               int                                             m_bbending:1;   
// Bending link
+@@ -215,6 +218,7 @@
+       /* Face                 */ 
+       struct  Face : Feature
+       {
++                Face (){} 
+               Node*                                   m_n[3];                 
// Node pointers
+               btVector3                               m_normal;               
// Normal
+               btScalar                                m_ra;                   
// Rest area
+@@ -255,6 +259,7 @@
+       /* Note                 */ 
+       struct  Note : Element
+       {
++                Note (){}
+               const char*                             m_text;                 
// Text
+               btVector3                               m_offset;               
// Offset
+               int                                             m_rank;         
        // Rank
+diff -Naur blender-2.56-beta-source/extern/Eigen2/Eigen/src/Core/util/Memory.h 
blender-2.56-beta-source-new/extern/Eigen2/Eigen/src/Core/util/Memory.h
+--- blender-2.56-beta-source/extern/Eigen2/Eigen/src/Core/util/Memory.h        
2009-10-20 07:50:24.000000000 -0200
++++ blender-2.56-beta-source-new/extern/Eigen2/Eigen/src/Core/util/Memory.h    
2011-02-08 16:06:14.142965371 -0200
+@@ -37,6 +37,8 @@
+ #define EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED 0
+ #endif
  
- #ifndef EIGEN_MEMORY_H
- #define EIGEN_MEMORY_H
 +#include <stddef.h>
++
+ #if defined(__APPLE__) || defined(_WIN64) || 
EIGEN_FREEBSD_MALLOC_ALREADY_ALIGNED
+   #define EIGEN_MALLOC_ALREADY_ALIGNED 1
+ #else
+diff -Naur blender-2.56-beta-source/intern/memutil/MEM_Allocator.h 
blender-2.56-beta-source-new/intern/memutil/MEM_Allocator.h
+--- blender-2.56-beta-source/intern/memutil/MEM_Allocator.h    2010-02-12 
11:34:04.000000000 -0200
++++ blender-2.56-beta-source-new/intern/memutil/MEM_Allocator.h        
2011-02-08 15:40:37.846834599 -0200
+@@ -24,6 +24,7 @@
+ #ifndef MEM_ALLOCATOR_H
+ #define MEM_ALLOCATOR_H
  
- // FreeBSD 6 seems to have 16-byte aligned malloc
- // See 
http://svn.freebsd.org/viewvc/base/stable/6/lib/libc/stdlib/malloc.c?view=markup
++#include <stddef.h>
+ #include "guardedalloc/MEM_guardedalloc.h"
+ #include "guardedalloc/BLO_sys_types.h"
+ 
+diff -Naur 
blender-2.56-beta-source/source/gameengine/Converter/BL_ArmatureChannel.cpp 
blender-2.56-beta-source-new/source/gameengine/Converter/BL_ArmatureChannel.cpp
+--- 
blender-2.56-beta-source/source/gameengine/Converter/BL_ArmatureChannel.cpp     
   2010-11-15 23:19:37.000000000 -0200
++++ 
blender-2.56-beta-source-new/source/gameengine/Converter/BL_ArmatureChannel.cpp 
   2011-02-08 16:45:20.671268280 -0200
+@@ -32,6 +32,7 @@
+ #include "BL_ArmatureConstraint.h"
+ #include "BLI_math.h"
+ #include "BLI_string.h"
++#include <stddef.h>
+ 
+ #ifdef WITH_PYTHON
+ 
+diff -Naur 
blender-2.56-beta-source/source/gameengine/Expressions/PyObjectPlus.h 
blender-2.56-beta-source-new/source/gameengine/Expressions/PyObjectPlus.h
+--- blender-2.56-beta-source/source/gameengine/Expressions/PyObjectPlus.h      
2010-10-31 02:11:39.000000000 -0200
++++ blender-2.56-beta-source-new/source/gameengine/Expressions/PyObjectPlus.h  
2011-02-08 16:46:22.135397092 -0200
+@@ -38,6 +38,7 @@
+ #include "STR_String.h"
+ #include "MT_Vector3.h"
+ #include "SG_QList.h"
++#include <stddef.h>
+ 
+ /*------------------------------
+  * Python defines
+--- blender-2.56.34784/source/blender/collada/AnimationImporter.cpp    
2010-11-09 00:13:49.000000000 +0100
++++ blender-2.56.34784/source/blender/collada/AnimationImporter.cpp    
2011-04-28 11:42:25.437000405 +0200
+@@ -43,6 +43,7 @@
+ #include "ArmatureImporter.h"
+ 
+ #include <algorithm>
++#include <cstddef>
+ 
+ // use this for retrieving bone names, since these must be unique
+ template<class T>




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to