diff options
| author | joerg <joerg> | 2012-07-03 18:10:03 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-07-03 18:10:03 +0000 |
| commit | 098af77d6c8f5cc1cc72e450a3525a5b8f057d7a (patch) | |
| tree | 1ff9fb1ae5837c087096a86c5254b671a7156116 /graphics | |
| parent | 4a28ca3d00833f858865a50269d7edce0b7880dc (diff) | |
| download | pkgsrc-098af77d6c8f5cc1cc72e450a3525a5b8f057d7a.tar.gz | |
Define ABS before using it. Don't use the address of a function when a
call is desired.
Diffstat (limited to 'graphics')
5 files changed, 53 insertions, 3 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 56cbe56fdbb..ccf06e50ac6 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2012/05/16 13:49:22 marino Exp $ +# $NetBSD: Makefile,v 1.80 2012/07/03 18:10:03 joerg Exp $ DISTNAME= blender-2.49b -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= graphics MASTER_SITES= http://download.blender.org/source/ diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 6d84b85a25c..89a0eb910ed 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.30 2011/04/01 11:31:56 wiz Exp $ +$NetBSD: distinfo,v 1.31 2012/07/03 18:10:03 joerg Exp $ SHA1 (blender-2.49b.tar.gz) = 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5 RMD160 (blender-2.49b.tar.gz) = 5b641de7b41af5e4186c9721b66eddc6870f9fbc @@ -12,4 +12,7 @@ SHA1 (patch-aj) = 59c935bc84101e3a57af5231d6f1153897bbbb03 SHA1 (patch-ak) = 98c93b7ee12e60aff0d8890cd1cdc7213515d270 SHA1 (patch-al) = 8589d359484351766bfb99e58debf075bebbfd66 SHA1 (patch-am) = 6da69ace1e9da706124621f6721fd4d4f804cc6f +SHA1 (patch-extern_solid_include_MT_Quaternion.h) = 7dda79b1ec874268f7cf38d846e7ad30aa8c2d88 +SHA1 (patch-intern_elbeem_intern_ntl__vector3dim.h) = 3aabccfa0040e43829841270f32e0263bfa236f1 +SHA1 (patch-intern_elbeem_intern_utilities.h) = 3d5a158b0c2fdaddc5897a3e8aa41a090c3a514c SHA1 (patch-source_blender_python_BPY__interface.c) = 9cc72c2fea93e9bfdf9b2f9cc147be90c044d53d diff --git a/graphics/blender/patches/patch-extern_solid_include_MT_Quaternion.h b/graphics/blender/patches/patch-extern_solid_include_MT_Quaternion.h new file mode 100644 index 00000000000..52ddfb45889 --- /dev/null +++ b/graphics/blender/patches/patch-extern_solid_include_MT_Quaternion.h @@ -0,0 +1,13 @@ +$NetBSD: patch-extern_solid_include_MT_Quaternion.h,v 1.1 2012/07/03 18:10:03 joerg Exp $ + +--- extern/solid/include/MT/Quaternion.h.orig 2012-07-03 13:16:43.000000000 +0000 ++++ extern/solid/include/MT/Quaternion.h +@@ -158,7 +158,7 @@ namespace MT { + + Quaternion<Scalar> inverse() const + { +- return conjugate / length2(); ++ return conjugate() / length2(); + } + + Quaternion<Scalar> slerp(const Quaternion<Scalar>& q, const Scalar& t) const diff --git a/graphics/blender/patches/patch-intern_elbeem_intern_ntl__vector3dim.h b/graphics/blender/patches/patch-intern_elbeem_intern_ntl__vector3dim.h new file mode 100644 index 00000000000..1c237de998d --- /dev/null +++ b/graphics/blender/patches/patch-intern_elbeem_intern_ntl__vector3dim.h @@ -0,0 +1,17 @@ +$NetBSD: patch-intern_elbeem_intern_ntl__vector3dim.h,v 1.1 2012/07/03 18:10:03 joerg Exp $ + +--- intern/elbeem/intern/ntl_vector3dim.h.orig 2012-07-03 13:12:36.000000000 +0000 ++++ intern/elbeem/intern/ntl_vector3dim.h +@@ -24,6 +24,12 @@ + #include <stdio.h> + #include <stdlib.h> + ++/* absolute value */ ++template < class T > ++inline T ++ABS( T a ) ++{ return (0 < a) ? a : -a ; } ++ + // hack for MSVC6.0 compiler + #ifdef _MSC_VER + #if _MSC_VER < 1300 diff --git a/graphics/blender/patches/patch-intern_elbeem_intern_utilities.h b/graphics/blender/patches/patch-intern_elbeem_intern_utilities.h new file mode 100644 index 00000000000..720d6239eee --- /dev/null +++ b/graphics/blender/patches/patch-intern_elbeem_intern_utilities.h @@ -0,0 +1,17 @@ +$NetBSD: patch-intern_elbeem_intern_utilities.h,v 1.1 2012/07/03 18:10:03 joerg Exp $ + +--- intern/elbeem/intern/utilities.h.orig 2012-07-03 13:09:45.000000000 +0000 ++++ intern/elbeem/intern/utilities.h +@@ -171,12 +171,6 @@ inline T + MAX( T a, T b ) + { return (a < b) ? b : a ; } + +-/* absolute value */ +-template < class T > +-inline T +-ABS( T a ) +-{ return (0 < a) ? a : -a ; } +- + /* sign of the value */ + template < class T > + inline T |