Sat Oct 20 22:10:18 2012 UTC ()
const global objects must have a defaulted constructor.
Make sure that functions are defined before used in templates.


(joerg)
diff -r1.31 -r1.32 pkgsrc/graphics/blender/distinfo
diff -r0 -r1.1 pkgsrc/graphics/blender/patches/patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h
diff -r0 -r1.1 pkgsrc/graphics/blender/patches/patch-extern_solid_src_complex_DT__BBoxTree.h
diff -r0 -r1.1 pkgsrc/graphics/blender/patches/patch-extern_solid_src_complex_DT__Complex.cpp

cvs diff -r1.31 -r1.32 pkgsrc/graphics/blender/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/blender/distinfo 2012/07/03 18:10:03 1.31
+++ pkgsrc/graphics/blender/distinfo 2012/10/20 22:10:18 1.32
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: distinfo,v 1.31 2012/07/03 18:10:03 joerg Exp $ 1$NetBSD: distinfo,v 1.32 2012/10/20 22:10:18 joerg Exp $
2 2
3SHA1 (blender-2.49b.tar.gz) = 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5 3SHA1 (blender-2.49b.tar.gz) = 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5
4RMD160 (blender-2.49b.tar.gz) = 5b641de7b41af5e4186c9721b66eddc6870f9fbc 4RMD160 (blender-2.49b.tar.gz) = 5b641de7b41af5e4186c9721b66eddc6870f9fbc
5Size (blender-2.49b.tar.gz) = 22918377 bytes 5Size (blender-2.49b.tar.gz) = 22918377 bytes
6SHA1 (patch-ab) = 6779022a78e895154e6e95cecf16e5465ffab637 6SHA1 (patch-ab) = 6779022a78e895154e6e95cecf16e5465ffab637
7SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2 7SHA1 (patch-ac) = dcfa14519404915a69bd626c8a5a6029d2535ca2
8SHA1 (patch-ad) = ee070c6e61585c5ee657f8aa0cd210c15f73bcc9 8SHA1 (patch-ad) = ee070c6e61585c5ee657f8aa0cd210c15f73bcc9
9SHA1 (patch-ah) = b45f534b4c5850da13e9b421f73e33c8d079696f 9SHA1 (patch-ah) = b45f534b4c5850da13e9b421f73e33c8d079696f
10SHA1 (patch-ai) = 31f94e8dcdabbe043d94a7fd53bfbdaa9d35fc99 10SHA1 (patch-ai) = 31f94e8dcdabbe043d94a7fd53bfbdaa9d35fc99
11SHA1 (patch-aj) = 59c935bc84101e3a57af5231d6f1153897bbbb03 11SHA1 (patch-aj) = 59c935bc84101e3a57af5231d6f1153897bbbb03
12SHA1 (patch-ak) = 98c93b7ee12e60aff0d8890cd1cdc7213515d270 12SHA1 (patch-ak) = 98c93b7ee12e60aff0d8890cd1cdc7213515d270
13SHA1 (patch-al) = 8589d359484351766bfb99e58debf075bebbfd66 13SHA1 (patch-al) = 8589d359484351766bfb99e58debf075bebbfd66
14SHA1 (patch-am) = 6da69ace1e9da706124621f6721fd4d4f804cc6f 14SHA1 (patch-am) = 6da69ace1e9da706124621f6721fd4d4f804cc6f
 15SHA1 (patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h) = 00d32551c63b68bedfab73f88e8b26a9a3a2adf3
15SHA1 (patch-extern_solid_include_MT_Quaternion.h) = 7dda79b1ec874268f7cf38d846e7ad30aa8c2d88 16SHA1 (patch-extern_solid_include_MT_Quaternion.h) = 7dda79b1ec874268f7cf38d846e7ad30aa8c2d88
 17SHA1 (patch-extern_solid_src_complex_DT__BBoxTree.h) = dbf724c1933c756fd61c68bf1acccee569b817d6
 18SHA1 (patch-extern_solid_src_complex_DT__Complex.cpp) = 7d53b7ceaedd0d1c467718037fb63395cbeb4559
16SHA1 (patch-intern_elbeem_intern_ntl__vector3dim.h) = 3aabccfa0040e43829841270f32e0263bfa236f1 19SHA1 (patch-intern_elbeem_intern_ntl__vector3dim.h) = 3aabccfa0040e43829841270f32e0263bfa236f1
17SHA1 (patch-intern_elbeem_intern_utilities.h) = 3d5a158b0c2fdaddc5897a3e8aa41a090c3a514c 20SHA1 (patch-intern_elbeem_intern_utilities.h) = 3d5a158b0c2fdaddc5897a3e8aa41a090c3a514c
18SHA1 (patch-source_blender_python_BPY__interface.c) = 9cc72c2fea93e9bfdf9b2f9cc147be90c044d53d 21SHA1 (patch-source_blender_python_BPY__interface.c) = 9cc72c2fea93e9bfdf9b2f9cc147be90c044d53d

File Added: pkgsrc/graphics/blender/patches/Attic/patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h
$NetBSD: patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h,v 1.1 2012/10/20 22:10:18 joerg Exp $

Some instanciations don't have a user-defined default constructor,
so make sure to use plain initialisation.

--- extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h.orig	2012-10-20 10:52:46.000000000 +0000
+++ extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
@@ -171,7 +171,7 @@ public:
 template <typename T>
 static inline void			ZeroInitialize(T& value)
 {
-	static const T	zerodummy;
+	static T	zerodummy;
 	value=zerodummy;
 }
 //

File Added: pkgsrc/graphics/blender/patches/Attic/patch-extern_solid_src_complex_DT__BBoxTree.h
$NetBSD: patch-extern_solid_src_complex_DT__BBoxTree.h,v 1.1 2012/10/20 22:10:18 joerg Exp $

--- extern/solid/src/complex/DT_BBoxTree.h.orig	2012-10-20 10:46:59.000000000 +0000
+++ extern/solid/src/complex/DT_BBoxTree.h
@@ -95,6 +95,15 @@ public:
     const Shape         *m_leaves;
 };
 
+inline DT_CBox computeCBox(MT_Scalar margin, const MT_Transform& xform) 
+{
+    const MT_Matrix3x3& basis = xform.getBasis();
+    return DT_CBox(MT_Point3(MT_Scalar(0.0), MT_Scalar(0.0), MT_Scalar(0.0)), 
+                   MT_Vector3(basis[0].length() * margin, 
+                              basis[1].length() * margin, 
+                              basis[2].length() * margin));
+} 
+
 template <typename Shape1, typename Shape2>
 class DT_ObjectData : public DT_RootData<Shape1> {
 public:

File Added: pkgsrc/graphics/blender/patches/Attic/patch-extern_solid_src_complex_DT__Complex.cpp
$NetBSD: patch-extern_solid_src_complex_DT__Complex.cpp,v 1.1 2012/10/20 22:10:18 joerg Exp $

--- extern/solid/src/complex/DT_Complex.cpp.orig	2012-10-20 10:47:02.000000000 +0000
+++ extern/solid/src/complex/DT_Complex.cpp
@@ -123,15 +123,6 @@ inline DT_CBox computeCBox(const DT_Conv
     return DT_CBox(p->bbox()); 
 }
 
-inline DT_CBox computeCBox(MT_Scalar margin, const MT_Transform& xform) 
-{
-    const MT_Matrix3x3& basis = xform.getBasis();
-    return DT_CBox(MT_Point3(MT_Scalar(0.0), MT_Scalar(0.0), MT_Scalar(0.0)), 
-                   MT_Vector3(basis[0].length() * margin, 
-                              basis[1].length() * margin, 
-                              basis[2].length() * margin));
-} 
-
 void DT_Complex::refit()
 {
     DT_RootData<const DT_Convex *> rd(m_nodes, m_leaves);