Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-gfx/blender/files/blender-2.60-eigen.patch
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-11-13 12:04:30 +0000
committerLuca Barbato <lu_zero@gentoo.org>2011-11-13 12:04:30 +0000
commit0d8980b43822ea4e9ea2266f002e7fba70aacaed (patch)
tree76432562b62206e668ddd3e8685a4a09fd2cd639 /media-gfx/blender/files/blender-2.60-eigen.patch
parentCorrected Slotting of media-libs/tiff (diff)
downloadhistorical-0d8980b43822ea4e9ea2266f002e7fba70aacaed.tar.gz
historical-0d8980b43822ea4e9ea2266f002e7fba70aacaed.tar.bz2
historical-0d8980b43822ea4e9ea2266f002e7fba70aacaed.zip
New version, thanks to Anthoine Bourgeois <anthoine.bourgeois@gmail.com> and everybody who helped on bug #369599
Package-Manager: portage-2.1.10.34/cvs/Linux x86_64
Diffstat (limited to 'media-gfx/blender/files/blender-2.60-eigen.patch')
-rw-r--r--media-gfx/blender/files/blender-2.60-eigen.patch293
1 files changed, 293 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.60-eigen.patch b/media-gfx/blender/files/blender-2.60-eigen.patch
new file mode 100644
index 000000000000..6955ee11c8c8
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.60-eigen.patch
@@ -0,0 +1,293 @@
+--- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200
++++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200
+@@ -5,7 +5,8 @@
+ sources += env.Glob('kdl/*.cpp')
+ sources += env.Glob('kdl/utilities/*.cpp')
+
+-incs = '. ../../extern/Eigen2'
++#incs = '. ../../extern/Eigen2'
++incs = '. /usr/include/eigen2'
+
+ env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
+
+--- source/blender/ikplugin/SConscript
++++ source/blender/ikplugin/SConscript
+@@ -4,6 +4,6 @@
+ sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
+
+ incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
+-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
++incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
+
+ env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )
+--- source/gameengine/Converter/SConscript 2009-09-26 09:14:02.000000000 +0200
++++ source/gameengine/Converter/SConscript 2009-09-26 09:14:54.000000000 +0200
+@@ -21,7 +21,8 @@
+ incs += ' #source/blender/makesrna'
+ incs += ' #source/blender/ikplugin'
+ incs += ' #extern/recastnavigation/Detour/Include'
+-incs += ' #extern/Eigen2'
++#incs += ' #extern/Eigen2'
++incs += ' /usr/include/eigen2'
+
+ incs += ' ' + env['BF_BULLET_INC']
+
+--- intern/itasc/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
++++ intern/itasc/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
+@@ -25,11 +25,11 @@
+ # ***** END GPL LICENSE BLOCK *****
+
+ set(INC
+- ../../extern/Eigen2
++ /usr/include/eigen2
+ )
+
+ set(INC_SYS
+-
++ /usr/include/eigen2
+ )
+
+ set(SRC
+@@ -117,113 +117,113 @@ set(SRC
+ ublas_types.hpp
+
+ # until we have another user...
+- ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h
+- ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h
+- ../../extern/Eigen2/Eigen/src/Array/Functors.h
+- ../../extern/Eigen2/Eigen/src/Array/Norms.h
+- ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h
+- ../../extern/Eigen2/Eigen/src/Array/Random.h
+- ../../extern/Eigen2/Eigen/src/Array/Select.h
+- ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h
+- ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h
+- ../../extern/Eigen2/Eigen/src/Core/Assign.h
+- ../../extern/Eigen2/Eigen/src/Core/Block.h
+- ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h
+- ../../extern/Eigen2/Eigen/src/Core/Coeffs.h
+- ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h
+- ../../extern/Eigen2/Eigen/src/Core/Cwise.h
+- ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h
+- ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h
+- ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h
+- ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h
+- ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h
+- ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h
+- ../../extern/Eigen2/Eigen/src/Core/Dot.h
+- ../../extern/Eigen2/Eigen/src/Core/Flagged.h
+- ../../extern/Eigen2/Eigen/src/Core/Functors.h
+- ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h
+- ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h
+- ../../extern/Eigen2/Eigen/src/Core/IO.h
+- ../../extern/Eigen2/Eigen/src/Core/Map.h
+- ../../extern/Eigen2/Eigen/src/Core/MapBase.h
+- ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h
+- ../../extern/Eigen2/Eigen/src/Core/Matrix.h
+- ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h
+- ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h
+- ../../extern/Eigen2/Eigen/src/Core/Minor.h
+- ../../extern/Eigen2/Eigen/src/Core/NestByValue.h
+- ../../extern/Eigen2/Eigen/src/Core/NumTraits.h
+- ../../extern/Eigen2/Eigen/src/Core/Part.h
+- ../../extern/Eigen2/Eigen/src/Core/Product.h
+- ../../extern/Eigen2/Eigen/src/Core/Redux.h
+- ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h
+- ../../extern/Eigen2/Eigen/src/Core/Sum.h
+- ../../extern/Eigen2/Eigen/src/Core/Swap.h
+- ../../extern/Eigen2/Eigen/src/Core/Transpose.h
+- ../../extern/Eigen2/Eigen/src/Core/Visitor.h
+- ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
+- ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Constants.h
+- ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
+- ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
+- ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Macros.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Memory.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Meta.h
+- ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h
+- ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h
+- ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h
+- ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h
+- ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h
+- ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h
+- ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h
+- ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Transform.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Translation.h
+- ../../extern/Eigen2/Eigen/src/LU/Determinant.h
+- ../../extern/Eigen2/Eigen/src/LU/Inverse.h
+- ../../extern/Eigen2/Eigen/src/LU/LU.h
+- ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h
+- ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h
+- ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h
+- ../../extern/Eigen2/Eigen/src/QR/QR.h
+- ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
+- ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h
+- ../../extern/Eigen2/Eigen/src/SVD/SVD.h
+- ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
+- ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h
+- ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h
+- ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h
+- ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
+- ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
+- ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h
+- ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h
+- ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h
+- ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
++ /usr/include/eigen2/Eigen/src/Array/BooleanRedux.h
++ /usr/include/eigen2/Eigen/src/Array/CwiseOperators.h
++ /usr/include/eigen2/Eigen/src/Array/Functors.h
++ /usr/include/eigen2/Eigen/src/Array/Norms.h
++ /usr/include/eigen2/Eigen/src/Array/PartialRedux.h
++ /usr/include/eigen2/Eigen/src/Array/Random.h
++ /usr/include/eigen2/Eigen/src/Array/Select.h
++ /usr/include/eigen2/Eigen/src/Cholesky/LDLT.h
++ /usr/include/eigen2/Eigen/src/Cholesky/LLT.h
++ /usr/include/eigen2/Eigen/src/Core/Assign.h
++ /usr/include/eigen2/Eigen/src/Core/Block.h
++ /usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
++ /usr/include/eigen2/Eigen/src/Core/Coeffs.h
++ /usr/include/eigen2/Eigen/src/Core/CommaInitializer.h
++ /usr/include/eigen2/Eigen/src/Core/Cwise.h
++ /usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
++ /usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
++ /usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
++ /usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
++ /usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h
++ /usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h
++ /usr/include/eigen2/Eigen/src/Core/Dot.h
++ /usr/include/eigen2/Eigen/src/Core/Flagged.h
++ /usr/include/eigen2/Eigen/src/Core/Functors.h
++ /usr/include/eigen2/Eigen/src/Core/Fuzzy.h
++ /usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h
++ /usr/include/eigen2/Eigen/src/Core/IO.h
++ /usr/include/eigen2/Eigen/src/Core/Map.h
++ /usr/include/eigen2/Eigen/src/Core/MapBase.h
++ /usr/include/eigen2/Eigen/src/Core/MathFunctions.h
++ /usr/include/eigen2/Eigen/src/Core/Matrix.h
++ /usr/include/eigen2/Eigen/src/Core/MatrixBase.h
++ /usr/include/eigen2/Eigen/src/Core/MatrixStorage.h
++ /usr/include/eigen2/Eigen/src/Core/Minor.h
++ /usr/include/eigen2/Eigen/src/Core/NestByValue.h
++ /usr/include/eigen2/Eigen/src/Core/NumTraits.h
++ /usr/include/eigen2/Eigen/src/Core/Part.h
++ /usr/include/eigen2/Eigen/src/Core/Product.h
++ /usr/include/eigen2/Eigen/src/Core/Redux.h
++ /usr/include/eigen2/Eigen/src/Core/SolveTriangular.h
++ /usr/include/eigen2/Eigen/src/Core/Sum.h
++ /usr/include/eigen2/Eigen/src/Core/Swap.h
++ /usr/include/eigen2/Eigen/src/Core/Transpose.h
++ /usr/include/eigen2/Eigen/src/Core/Visitor.h
++ /usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
++ /usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
++ /usr/include/eigen2/Eigen/src/Core/util/Constants.h
++ /usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
++ /usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
++ /usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h
++ /usr/include/eigen2/Eigen/src/Core/util/Macros.h
++ /usr/include/eigen2/Eigen/src/Core/util/Memory.h
++ /usr/include/eigen2/Eigen/src/Core/util/Meta.h
++ /usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h
++ /usr/include/eigen2/Eigen/src/Core/util/XprHelper.h
++ /usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h
++ /usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h
++ /usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h
++ /usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h
++ /usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h
++ /usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
++ /usr/include/eigen2/Eigen/src/Geometry/Quaternion.h
++ /usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h
++ /usr/include/eigen2/Eigen/src/Geometry/RotationBase.h
++ /usr/include/eigen2/Eigen/src/Geometry/Scaling.h
++ /usr/include/eigen2/Eigen/src/Geometry/Transform.h
++ /usr/include/eigen2/Eigen/src/Geometry/Translation.h
++ /usr/include/eigen2/Eigen/src/LU/Determinant.h
++ /usr/include/eigen2/Eigen/src/LU/Inverse.h
++ /usr/include/eigen2/Eigen/src/LU/LU.h
++ /usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
++ /usr/include/eigen2/Eigen/src/QR/EigenSolver.h
++ /usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
++ /usr/include/eigen2/Eigen/src/QR/QR.h
++ /usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
++ /usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h
++ /usr/include/eigen2/Eigen/src/SVD/SVD.h
++ /usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h
++ /usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h
++ /usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h
++ /usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h
++ /usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
++ /usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
++ /usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseDot.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseLU.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseVector.h
++ /usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
++ /usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h
++ /usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h
++ /usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
+ )
+
+ blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
+--- source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
++++ source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
+@@ -50,7 +50,7 @@
+ if(WITH_IK_ITASC)
+ add_definitions(-DWITH_IK_ITASC)
+ list(APPEND INC
+- ../../../extern/Eigen2
++ /usr/include/eigen2
+ ../../../intern/itasc
+ )
+ list(APPEND SRC
+--- source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
++++ source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
+@@ -51,7 +51,7 @@
+ ../../blender/makesrna
+ ../../blender/windowmanager
+ ../../../extern/bullet2/src
+- ../../../extern/Eigen2
++ /usr/include/eigen2
+ ../../../intern/container
+ ../../../intern/guardedalloc
+ ../../../intern/moto/include