Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorAnthoine Bourgeois <anthoine.bourgeois@gmail.com>2011-11-11 02:06:55 +0100
committerAnthoine Bourgeois <anthoine.bourgeois@gmail.com>2011-11-11 02:06:55 +0100
commit6c2da72fd7f3f377da2780d23ea94b4fc3000d2d (patch)
tree9ff6d61e56f4b5382b5b9346da9aeeca3082ea97 /media-gfx
parent+blender-2.60a.ebuild (diff)
downloadaluco-6c2da72fd7f3f377da2780d23ea94b4fc3000d2d.tar.gz
aluco-6c2da72fd7f3f377da2780d23ea94b4fc3000d2d.tar.bz2
aluco-6c2da72fd7f3f377da2780d23ea94b4fc3000d2d.zip
Fix somes dependencies.
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/Manifest9
-rw-r--r--media-gfx/blender/blender-2.60a.ebuild14
-rw-r--r--media-gfx/blender/files/blender-2.60-eigen.patch259
-rw-r--r--media-gfx/blender/files/blender-2.60-glew.patch23
-rw-r--r--media-gfx/blender/files/blender-2.60-openjpeg.patch12
-rw-r--r--media-gfx/blender/files/blender-2.60a-cmake.patch67
6 files changed, 373 insertions, 11 deletions
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index e355973..d4d0069 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,12 +1,13 @@
AUX blender-2.60-bmake.patch 424 RMD160 0520e3f4a9a02be1b679d38934c2358a6f1c1fa2 SHA1 347a95208976878c56ebcd42f3484c95eca4c0fe SHA256 f69ecf7cd54ba9099408568f436e65b18e4d55f15ac1c07054cbd7c8d18c24bf
AUX blender-2.60-doxyfile.patch 595 RMD160 f4890f0ead6943f323bc61e7f6766c2133e8591b SHA1 0fd7c202f044224cf9944596cf36cfcd56b39067 SHA256 d267e0fab4ecb9be78b9238a9c2af60ac9d5ddb7b42f73f479b9266704605883
-AUX blender-2.60-eigen.patch 1385 RMD160 4e4d33d24271a086da5276695aecc37c8db8109f SHA1 b4b7e5a052205ecad30168a31922744afeae77d3 SHA256 a41254f2eb6714a52f40b93d983d5c92e6d8eaf539bfe72d3db29920e2981e2a
-AUX blender-2.60-glew.patch 510 RMD160 5acd32d387f7b585580d2be44f3a7b58cf362e70 SHA1 c525aabb72e272a292f620357e461db38ed881c3 SHA256 458ecba567df1798ad6d6bc0f078aec89ae726bf1e6a36c09feaa0860f5d89cd
-AUX blender-2.60-openjpeg.patch 1045 RMD160 fe697855f8f0b0b47bb1787f24031210debad27a SHA1 cff1e90dff3e51f54fd343b7aed15edaf9f35175 SHA256 2f983642724487aefd2578fd955ff3a464d2b83005ee7cf6ae67488230fc25f0
+AUX blender-2.60-eigen.patch 13804 RMD160 67b2d444f35ac5b9f2e2fc1ee93a105feadc83db SHA1 943ba7ebd2f37102b62d790d7ad4795695fba268 SHA256 b973b07db667ab84eebae24c47805772f6f2694bb77cb8846431d502c56b54d8
+AUX blender-2.60-glew.patch 1128 RMD160 392907190c8c970a1b2f0b20067d9f1bf108edbc SHA1 e9890bc4c420b16ce4f9c9c6cfc71c13852e4de3 SHA256 a43f0a0ac2a0cc5096e8488c926e7a32933a5910300440590a1cac5e1bb73f20
+AUX blender-2.60-openjpeg.patch 1731 RMD160 898318cfdc0c5daafd39d1f0f116531c6a2fd69f SHA1 5870c4f7b50f9edc4d12b68a684b8bb32548ad20 SHA256 3a684711e40ba365152593a6c90bbf38b190c84132e288c3dd3c7409dc6f9a62
AUX blender-2.60a-CVE-2009-3850-v3.patch 7787 RMD160 02afc6ef3bcdf314c693c44be0cfc649ffd4ebf3 SHA1 031b42d09021b027dde631f08bc8e973299edab9 SHA256 1aebbdd475ccdb1d4e77c4c1ae4c3205e76a1a06f7dcd5e70624c141f42d204b
+AUX blender-2.60a-cmake.patch 1878 RMD160 c8e2c5f77fad86475b10b4634ba6efdf1f8f3ac4 SHA1 8e0c38ed3fe1bdfeb74ac6313d4aaae661fd742c SHA256 540602705f85971378fe86e28c2ac888a21085c49a6fe1cca762b30b922e77e8
AUX blender-2.60a-enable_site_module.patch 974 RMD160 e93ddcd1372751951b6e56f72c764e2043747574 SHA1 84aed7ab30f5de1989ee63b4584db7acd6747b54 SHA256 dfafc00a08504c0c3259083d01e535e00f9a952db4a551dbacf0a62ad1a5c768
AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
AUX blender-desktop.patch 641 RMD160 af973d38300270e20eb76331da26e619b1d8d73f SHA1 aae3b7dc1ab89e40a6269c4a9593f0f064010eb8 SHA256 fe7e11d4793fce2b2ec4559fbeba05fe395d4b728764e8cc66e6881e7444d7fb
DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124
-EBUILD blender-2.60a.ebuild 13275 RMD160 0460bd678a3e92c4112594934d6f5010528faef6 SHA1 68b05bcd957d260a8decc077891af1d987837032 SHA256 b47c665b0ed49fe259ab77b6d2d7c53d3dc02d44342177533b292256f82de9eb
+EBUILD blender-2.60a.ebuild 13321 RMD160 a03ea6d0cc72c0037b7c9c166b2559bcdd16b37e SHA1 e70601385f0f227d87a92c092cf4649dfb0413af SHA256 3232ce5a820fc438f5c074e1e5992d86cac55f991f4a57cacd5fd30338939d0a
MISC metadata.xml 1953 RMD160 d34820d0ff77c323156115939aa16575c4d08130 SHA1 220ede2f65489b3ce59c8b79a714b4984d91f5b2 SHA256 6189d779179d2c30e4f99b91fcc09f7cf4e09d41b80312c33455df7ce24eee73
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index b335d87..7d20edf 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -54,8 +54,8 @@ RDEPEND="virtual/jpeg
openexr? ( media-libs/openexr )
ffmpeg? (
>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
+ jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
)
- jpeg2k? ( media-libs/openjpeg )
openal? ( >=media-libs/openal-1.6.372 )
fftw? ( sci-libs/fftw:3.0 )
jack? ( media-sound/jack-audio-connection-kit )
@@ -145,7 +145,7 @@ src_prepare() {
# epatch "${FILESDIR}"/${P}-libav-0.7.patch
epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch
epatch "${FILESDIR}"/${P}-enable_site_module.patch
-
+ epatch "${FILESDIR}"/${P}-cmake.patch
}
src_configure() {
@@ -331,11 +331,11 @@ src_install() {
"${WORKDIR}/install/blenderplayer-${SLOT}"
doexe "${WORKDIR}/install/blenderplayer-${SLOT}"
fi
- if use verse; then
- cp "${WORKDIR}"/install/bin/verse_server \
- "${WORKDIR}/install/bin/verse_server-${SLOT}"
- doexe "${WORKDIR}"/install/bin/verse_server-${SLOT}
- fi
+# if use verse; then
+# cp "${WORKDIR}"/install/bin/verse_server \
+# "${WORKDIR}/install/bin/verse_server-${SLOT}"
+# doexe "${WORKDIR}"/install/bin/verse_server-${SLOT}
+# fi
# install plugins
exeinto /usr/share/${PN}/${SLOT}/textures
diff --git a/media-gfx/blender/files/blender-2.60-eigen.patch b/media-gfx/blender/files/blender-2.60-eigen.patch
index 1d0ce94..6955ee1 100644
--- a/media-gfx/blender/files/blender-2.60-eigen.patch
+++ b/media-gfx/blender/files/blender-2.60-eigen.patch
@@ -32,3 +32,262 @@
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
diff --git a/media-gfx/blender/files/blender-2.60-glew.patch b/media-gfx/blender/files/blender-2.60-glew.patch
index dc0378a..edc0c9b 100644
--- a/media-gfx/blender/files/blender-2.60-glew.patch
+++ b/media-gfx/blender/files/blender-2.60-glew.patch
@@ -23,3 +23,26 @@
/*
* these should be phased out. cpack should be replaced in
+--- extern/CMakeLists.txt
++++ extern/CMakeLists.txt
+@@ -39,9 +39,6 @@
+ add_subdirectory(binreloc)
+ endif()
+
+-if(WITH_BUILTIN_GLEW)
+- add_subdirectory(glew)
+-endif()
+
+ if(WITH_GAMEENGINE)
+ add_subdirectory(recastnavigation)
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -150,7 +150,7 @@
+
+ if(UNIX AND NOT APPLE)
+ option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON)
+- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
++ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
+ else()
+ # not an option for other OS's
+ set(WITH_BUILTIN_GLEW ON)
diff --git a/media-gfx/blender/files/blender-2.60-openjpeg.patch b/media-gfx/blender/files/blender-2.60-openjpeg.patch
index 522555a..74f6441 100644
--- a/media-gfx/blender/files/blender-2.60-openjpeg.patch
+++ b/media-gfx/blender/files/blender-2.60-openjpeg.patch
@@ -23,3 +23,15 @@ diff -Npur blender-2.60a.orig/extern/SConscript blender-2.60a/extern/SConscript
-
if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
SConscript(['libredcode/SConscript'])
+diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py blender-2.60a/build_files/scons/tools/Blender.py
+--- blender-2.60a.orig/build_files/scons/tools/Blender.py 2011-11-09 23:05:16.241465491 +0100
++++ blender-2.60a/build_files/scons/tools/Blender.py 2011-11-09 23:06:24.188464236 +0100
+@@ -246,6 +246,8 @@
+ syslibs += Split(lenv['BF_FFMPEG_LIB'])
+ if lenv['WITH_BF_OGG']:
+ syslibs += Split(lenv['BF_OGG_LIB'])
++ if lenv['WITH_BF_OPENJPEG']:
++ syslibs += Split(lenv['BF_OPENJPEG_LIB'])
+ if lenv['WITH_BF_JACK']:
+ syslibs += Split(lenv['BF_JACK_LIB'])
+ if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
diff --git a/media-gfx/blender/files/blender-2.60a-cmake.patch b/media-gfx/blender/files/blender-2.60a-cmake.patch
new file mode 100644
index 0000000..0355850
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.60a-cmake.patch
@@ -0,0 +1,67 @@
+--- source/creator/CMakeLists.txt.orig 2011-11-11 01:19:03.166796150 +0100
++++ source/creator/CMakeLists.txt 2011-11-11 01:19:48.300795335 +0100
+@@ -745,6 +745,7 @@ set(BLENDER_LINK_LIBS
+ ${BLENDER_LINK_LIBS}
+ bf_windowmanager
+ bf_render
++ bf_render_raytrace
+ )
+
+ if(WITH_MOD_FLUID)
+@@ -795,6 +796,7 @@ endif()
+ bf_editor_datafiles
+
+ bf_render
++ bf_render_raytrace
+ bf_intern_opennl
+ bf_python
+ bf_python_ext
+--- source/blender/render/CMakeLists.txt.orig 2011-11-11 01:19:26.089795736 +0100
++++ source/blender/render/CMakeLists.txt 2011-11-11 01:21:56.243793090 +0100
+@@ -43,6 +43,27 @@ set(INC_SYS
+
+ )
+
++set(SRC_RAYTRACE
++ intern/raytrace/rayobject.cpp
++ intern/raytrace/rayobject_empty.cpp
++ intern/raytrace/rayobject_octree.cpp
++ intern/raytrace/rayobject_raycounter.cpp
++ intern/raytrace/rayobject_svbvh.cpp
++ intern/raytrace/rayobject_blibvh.cpp
++ intern/raytrace/rayobject_instance.cpp
++ intern/raytrace/rayobject_qbvh.cpp
++ intern/raytrace/rayobject_rtbuild.cpp
++ intern/raytrace/rayobject_vbvh.cpp
++
++ intern/raytrace/bvh.h
++ intern/raytrace/rayobject_hint.h
++ intern/raytrace/rayobject_internal.h
++ intern/raytrace/rayobject_rtbuild.h
++ intern/raytrace/reorganize.h
++ intern/raytrace/svbvh.h
++ intern/raytrace/vbvh.h
++)
++
+ set(SRC
+ intern/raytrace/rayobject.cpp
+ intern/raytrace/rayobject_empty.cpp
+@@ -107,13 +128,6 @@ set(SRC
+ intern/include/volumetric.h
+ intern/include/voxeldata.h
+ intern/include/zbuf.h
+- intern/raytrace/bvh.h
+- intern/raytrace/rayobject_hint.h
+- intern/raytrace/rayobject_internal.h
+- intern/raytrace/rayobject_rtbuild.h
+- intern/raytrace/reorganize.h
+- intern/raytrace/svbvh.h
+- intern/raytrace/vbvh.h
+ )
+
+ if(WITH_IMAGE_OPENEXR)
+@@ -142,3 +156,4 @@ if(APPLE)
+ endif()
+
+ blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}")
++blender_add_lib_nolist(bf_render_raytrace "${SRC_RAYTRACE}" "${INC}" "${INC_SYS}")