Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Luca Barbato (lu_zero)" <lu_zero@g.o>
Subject: gentoo-x86 commit in media-gfx/blender/files: blender-2.60-doxyfile.patch blender-2.60a-insecure.desktop blender-2.60a-linux-3.patch blender-2.60-eigen.patch blender-2.60-openjpeg.patch blender-2.60a-enable_site_module.patch blender-2.60-bmake.patch blender-2.60a-CVE-2009-3850-v3.patch blender-desktop.patch blender-2.60-glew.patch blender-2.60a-libav-0.7.patch
Date: Sun, 13 Nov 2011 12:04:30 +0000 (UTC)
lu_zero     11/11/13 12:04:30

  Added:                blender-2.60-doxyfile.patch
                        blender-2.60a-insecure.desktop
                        blender-2.60a-linux-3.patch
                        blender-2.60-eigen.patch
                        blender-2.60-openjpeg.patch
                        blender-2.60a-enable_site_module.patch
                        blender-2.60-bmake.patch
                        blender-2.60a-CVE-2009-3850-v3.patch
                        blender-desktop.patch blender-2.60-glew.patch
                        blender-2.60a-libav-0.7.patch
  Log:
  New version, thanks to Anthoine Bourgeois <anthoine.bourgeois@...> and everybody who helped on bug #369599
  
  (Portage version: 2.1.10.34/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-gfx/blender/files/blender-2.60-doxyfile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-doxyfile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-doxyfile.patch?rev=1.1&content-type=text/plain

Index: blender-2.60-doxyfile.patch
===================================================================
--- blender-2.58a/doc/doxygen/Doxyfile   2011-07-11 23:27:33.975642545 -0300
+++ blender-2.58a/doc/doxygen/Doxyfile   2011-07-11 23:28:54.913642574 -0300
@@ -42,7 +42,7 @@
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
-PROJECT_LOGO           = ../../release/freedesktop/icons/48x48/blender.png
+PROJECT_LOGO           = ../../release/freedesktop/icons/48x48/apps/blender.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put. 



1.1                  media-gfx/blender/files/blender-2.60a-insecure.desktop

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-insecure.desktop?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-insecure.desktop?rev=1.1&content-type=text/plain

Index: blender-2.60a-insecure.desktop
===================================================================
[Desktop Entry]
Name=Blender-2.6 (reduced security)
GenericName=3D modeller
GenericName[es]=modelador 3D
GenericName[de]=3D Modellierer
GenericName[fr]=modeleur 3D
GenericName[ru]=Редактор 3D-моделей
Comment=3D modeling, animation, rendering and post-production
Comment[es]=modelado 3D, animación, renderizado y post-producción
Exec=blender-2.60 --enable-autoexec
Icon=blender-2.60
Terminal=false
Type=Application
Categories=Graphics;3DGraphics;
MimeType=application/x-blender;



1.1                  media-gfx/blender/files/blender-2.60a-linux-3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-linux-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-linux-3.patch?rev=1.1&content-type=text/plain

Index: blender-2.60a-linux-3.patch
===================================================================
--- SConstruct	2011-10-29 05:18:43.149564401 +0200
+++ SConstruct	2011-10-29 05:19:37.332887017 +0200
@@ -165,6 +165,9 @@
 if crossbuild and platform not in ('win32-vc', 'win64-vc'):
     platform = 'linuxcross'
 
+if platform == 'linux3':
+    platform = 'linux2'  # Workaround for Linux 3.x
+
 env['OURPLATFORM'] = platform
 
 configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")



1.1                  media-gfx/blender/files/blender-2.60-eigen.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-eigen.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-eigen.patch?rev=1.1&content-type=text/plain

Index: blender-2.60-eigen.patch
===================================================================
--- 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



1.1                  media-gfx/blender/files/blender-2.60-openjpeg.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-openjpeg.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-openjpeg.patch?rev=1.1&content-type=text/plain

Index: blender-2.60-openjpeg.patch
===================================================================
diff -Npur blender-2.60a.orig/extern/libredcode/SConscript blender-2.60a/extern/libredcode/SConscript
--- blender-2.60a.orig/extern/libredcode/SConscript	2011-11-09 23:05:16.241465491 +0100
+++ blender-2.60a/extern/libredcode/SConscript	2011-11-09 23:06:24.188464236 +0100
@@ -7,7 +7,8 @@
 Import('env')

 sources = env.Glob('*.c')
-incs = '. ../libopenjpeg'
+#incs = '. ../libopenjpeg'
+incs = '. /usr/include'

 env.BlenderLib ( libname='extern_redcode', 
                  sources=sources, includes=Split(incs),
diff -Npur blender-2.60a.orig/extern/SConscript blender-2.60a/extern/SConscript
--- blender-2.60a.orig/extern/SConscript	2011-11-09 23:05:16.241465491 +0100
+++ blender-2.60a/extern/SConscript	2011-11-09 23:06:24.188464236 +0100
@@ -11,8 +11,5 @@
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])

-if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
-    SConscript(['libopenjpeg/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']:



1.1                  media-gfx/blender/files/blender-2.60a-enable_site_module.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-enable_site_module.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-enable_site_module.patch?rev=1.1&content-type=text/plain

Index: blender-2.60a-enable_site_module.patch
===================================================================
--- source/blender/python/intern/bpy_interface.c
+++ source/blender/python/intern/bpy_interface.c
@@ -203,11 +203,6 @@
	/* allow to use our own included python */
	PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
 
-	/* Python 3.2 now looks for '2.58/python/include/python3.2d/pyconfig.h' to parse
-	 * from the 'sysconfig' module which is used by 'site', so for now disable site.
-	 * alternatively we could copy the file. */
-	Py_NoSiteFlag= 1;
-
 	Py_Initialize();
 	
 	// PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
--- source/gameengine/Ketsji/KX_PythonInit.cpp
+++ source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -1825,7 +1825,6 @@
 	STR_String pname = progname;
 	Py_SetProgramName(pname.Ptr());
 #endif
-	Py_NoSiteFlag=1;
 	Py_FrozenFlag=1;
 
 	/* must run before python initializes */
@@ -1898,7 +1897,6 @@
 	STR_String pname = progname;
 	Py_SetProgramName(pname.Ptr());
 #endif
-	Py_NoSiteFlag=1;
 	Py_FrozenFlag=1;
 
 	initPyTypes();



1.1                  media-gfx/blender/files/blender-2.60-bmake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-bmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-bmake.patch?rev=1.1&content-type=text/plain

Index: blender-2.60-bmake.patch
===================================================================
diff -Npur release/plugins.orig/bmake release/plugins/bmake
--- release/plugins.orig/bmake	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/bmake	2011-11-11 15:01:40.637923565 +0100
@@ -57,10 +57,10 @@
	LDFLAGS="-Bshareable";
 elif ( test $UNAME = "Linux" ) then
	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
+#	CFLAGS="-fPIC -funsigned-char -O2";

	LD="ld";
-	LDFLAGS="-Bshareable";
+#	LDFLAGS="-Bshareable";
 elif ( test $UNAME = "SunOS" ) then
	CC="cc";
	CFLAGS="-O";
@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then
 	INCLUDES=-I..;
 elif ( test -f "../include/plugin.h" ) then
 	INCLUDES=-I../include
+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
+	INCLUDES=-I../../../source/blender/blenpluginapi
 else 
 	echo "Couldn't find plugin.h";
 	exit;
 fi
 
 LIBM=`fgrep "#include <math.h>" $CFILE`
-LIBC=`fgrep "#include <std" $CFILE`
 
-LIBS=
+LIBS="-lc"
 
 if ( test -n "$LIBM" ) then
 	LIBS="$LIBS -lm"; 
 fi
-if ( test -n "$LIBC" ) then 
-	LIBS="$LIBS -lc"; 
-fi
 
 echo "$CC $CFLAGS -c $CFILE $INCLUDES"
 $CC $CFLAGS -c $CFILE $INCLUDES
diff -Npur release/plugins.orig/sequence/color-correction-hsv.c release/plugins/sequence/color-correction-hsv.c
--- release/plugins.orig/sequence/color-correction-hsv.c	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/sequence/color-correction-hsv.c	2011-11-11 15:03:47.233921332 +0100
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include <stdio.h>
 
diff -Npur release/plugins.orig/sequence/color-correction-yuv.c release/plugins/sequence/color-correction-yuv.c
--- release/plugins.orig/sequence/color-correction-yuv.c	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/sequence/color-correction-yuv.c	2011-11-11 15:02:10.446923031 +0100
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include <stdio.h>
 
diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c
--- release/plugins.orig/sequence/dnr.c	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/sequence/dnr.c	2011-11-11 15:03:30.049921648 +0100
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include <stdio.h>
 
diff -Npur release/plugins.orig/sequence/gamma.c release/plugins/sequence/gamma.c
--- release/plugins.orig/sequence/gamma.c	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/sequence/gamma.c	2011-11-11 15:01:58.982923268 +0100
@@ -15,7 +15,7 @@
  *
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 #include "util.h"
 #include <stdio.h>
diff -Npur release/plugins.orig/texture/clouds2.c release/plugins/texture/clouds2.c
--- release/plugins.orig/texture/clouds2.c	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/texture/clouds2.c	2011-11-11 15:02:23.104922789 +0100
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
  
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 
 /* ******************** GLOBAL VARIABLES ***************** */
diff -Npur release/plugins.orig/texture/tiles.c release/plugins/texture/tiles.c
--- release/plugins.orig/texture/tiles.c	2011-11-11 15:00:26.339924887 +0100
+++ release/plugins/texture/tiles.c	2011-11-11 15:04:05.749921038 +0100
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "math.h"
+#include <math.h>
 #include "plugin.h"
 
 /* ******************** GLOBAL VARIABLES ***************** */



1.1                  media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch?rev=1.1&content-type=text/plain

Index: blender-2.60a-CVE-2009-3850-v3.patch
===================================================================
diff -Npur blender-2.60a.orig/source/blender/blenkernel/intern/blender.c blender-2.60a/source/blender/blenkernel/intern/blender.c
--- blender-2.60a.orig/source/blender/blenkernel/intern/blender.c	2011-11-09 20:56:11.905602401 +0100
+++ blender-2.60a/source/blender/blenkernel/intern/blender.c	2011-11-09 20:56:42.827601857 +0100
@@ -145,6 +145,7 @@ void initglobals(void)
 	G.f |= G_SCRIPT_AUTOEXEC;
 #else
 	G.f &= ~G_SCRIPT_AUTOEXEC;
+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
 #endif
 }
 
diff -Npur blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.60a/source/blender/makesrna/intern/rna_userdef.c
--- blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c	2011-11-09 20:56:12.003602399 +0100
+++ blender-2.60a/source/blender/makesrna/intern/rna_userdef.c	2011-11-09 21:02:43.204595484 +0100
@@ -116,9 +116,17 @@ static void rna_userdef_show_manipulator
 
 static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	UserDef *userdef = (UserDef*)ptr->data;
-	if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
-	else												G.f |=  G_SCRIPT_AUTOEXEC;
+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
+		/* Blender run with --enable-autoexec */
+		UserDef *userdef = (UserDef*)ptr->data;
+		if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE)	G.f &= ~G_SCRIPT_AUTOEXEC;
+		else												G.f |=  G_SCRIPT_AUTOEXEC;
+	}
+}
+
+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
+	return !(G.f & G_SCRIPT_OVERRIDE_PREF);
 }
 
 static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
@@ -2630,6 +2638,8 @@ static void rna_def_userdef_system(Blend
 	                         "Allow any .blend file to run scripts automatically "
 	                         "(unsafe with blend files from an untrusted source)");
 	RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
+	/* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
+	RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
 
 	prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c blender-2.60a/source/blender/windowmanager/intern/wm_files.c
--- blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c	2011-11-09 20:56:12.458602413 +0100
+++ blender-2.60a/source/blender/windowmanager/intern/wm_files.c	2011-11-09 21:05:16.768592770 +0100
@@ -285,12 +285,17 @@ static void wm_init_userdef(bContext *C)
 
 	/* set the python auto-execute setting from user prefs */
 	/* enabled by default, unless explicitly enabled in the command line which overrides */
-	if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
+	if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
+		/* Blender run with --enable-autoexec */
 		if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
 		else											  G.f &= ~G_SCRIPT_AUTOEXEC;
 	}
 	/* update tempdir from user preferences */
 	BLI_where_is_temp(btempdir, FILE_MAX, 1);
+
+	/* Workaround to fix default of "Auto Run Python Scripts" checkbox */
+	if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
+		U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
 }
 
 
diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.60a/source/blender/windowmanager/intern/wm_operators.c
--- blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c	2011-11-09 20:56:12.458602413 +0100
+++ blender-2.60a/source/blender/windowmanager/intern/wm_operators.c	2011-11-09 21:07:09.746590772 +0100
@@ -1583,12 +1583,13 @@ static int wm_open_mainfile_exec(bContex
 		G.fileflags &= ~G_FILE_NO_UI;
 	else
 		G.fileflags |= G_FILE_NO_UI;
-		
-	if(RNA_boolean_get(op->ptr, "use_scripts"))
+
+	/* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
+	if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
 		G.f |= G_SCRIPT_AUTOEXEC;
 	else
 		G.f &= ~G_SCRIPT_AUTOEXEC;
-	
+
 	// XXX wm in context is not set correctly after WM_read_file -> crash
 	// do it before for now, but is this correct with multiple windows?
 	WM_event_add_notifier(C, NC_WINDOW, NULL);
@@ -1600,6 +1601,8 @@ static int wm_open_mainfile_exec(bContex
 
 static void WM_OT_open_mainfile(wmOperatorType *ot)
 {
+	PropertyRNA * use_scripts_checkbox = NULL;
+
 	ot->name= "Open Blender File";
 	ot->idname= "WM_OT_open_mainfile";
 	ot->description="Open a Blender file";
@@ -1611,7 +1614,12 @@ static void WM_OT_open_mainfile(wmOperat
 	WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
 
 	RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-	RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
+	use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
+			!!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
+			"Allow blend file execute scripts automatically, default available from system preferences");
+	/* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
+	if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
+		RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
 }
 
 /* **************** link/append *************** */
diff -Npur blender-2.60a.orig/source/creator/creator.c blender-2.60a/source/creator/creator.c
--- blender-2.60a.orig/source/creator/creator.c	2011-11-09 20:56:11.899602401 +0100
+++ blender-2.60a/source/creator/creator.c	2011-11-09 21:17:22.278579932 +0100
@@ -258,6 +258,7 @@ static int print_help(int UNUSED(argc),
 
 	printf("\n");
 
+	BLI_argsPrintArgDoc(ba, "-666");
 	BLI_argsPrintArgDoc(ba, "--enable-autoexec");
 	BLI_argsPrintArgDoc(ba, "--disable-autoexec");
 
@@ -326,14 +327,14 @@ static int end_arguments(int UNUSED(argc
 static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {
 	G.f |= G_SCRIPT_AUTOEXEC;
-	G.f |= G_SCRIPT_OVERRIDE_PREF;
+	G.f &= ~G_SCRIPT_OVERRIDE_PREF;  /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
 	return 0;
 }
 
 static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
 {
 	G.f &= ~G_SCRIPT_AUTOEXEC;
-	G.f |= G_SCRIPT_OVERRIDE_PREF;
+	G.f |= G_SCRIPT_OVERRIDE_PREF;  /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
 	return 0;
 }
 
@@ -1055,8 +1056,9 @@ static void setupArguments(bContext *C,
 #  define 	PY_DISABLE_AUTO ", (compiled as non-standard default)"
 #endif
 
-	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
+	BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.60a)" PY_ENABLE_AUTO, enable_python, NULL);
+	BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
+	BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
 
 #undef PY_ENABLE_AUTO
 #undef PY_DISABLE_AUTO



1.1                  media-gfx/blender/files/blender-desktop.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-desktop.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-desktop.patch?rev=1.1&content-type=text/plain

Index: blender-desktop.patch
===================================================================
--- release/freedesktop/blender.desktop   2010-09-12 00:05:51.000000000 -0700
+++ release/freedesktop/blender.desktop   2010-09-12 00:07:32.000000000 -0700
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Blender
+Name=Blender-2.6
 GenericName=3D modeller
 GenericName[es]=modelador 3D
 GenericName[de]=3D Modellierer
@@ -7,8 +7,8 @@
 GenericName[ru]=Редактор 3D-моделей
 Comment=3D modeling, animation, rendering and post-production
 Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender
-Icon=blender
+Exec=blender-2.60
+Icon=blender-2.60
 Terminal=false
 Type=Application
 Categories=Graphics;3DGraphics;



1.1                  media-gfx/blender/files/blender-2.60-glew.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-glew.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-glew.patch?rev=1.1&content-type=text/plain

Index: blender-2.60-glew.patch
===================================================================
--- extern/SConscript
+++ extern/SConscript
@@ -2,8 +2,6 @@
 
 Import('env')
 
-SConscript(['glew/SConscript'])
-
 if env['WITH_BF_GAMEENGINE']:
	 SConscript(['recastnavigation/SConscript'])

 if env['WITH_BF_ELTOPO']:
	 SConscript(['eltopo/SConscript'])

--- source/blender/editors/include/BIF_gl.h
+++ source/blender/editors/include/BIF_gl.h
@@ -35,7 +35,7 @@
 #ifndef BIF_GL_H
 #define BIF_GL_H
 
-#include "GL/glew.h"
+#include <GL/glew.h>
 
	/*
	 * 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)



1.1                  media-gfx/blender/files/blender-2.60a-libav-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-libav-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-libav-0.7.patch?rev=1.1&content-type=text/plain

Index: blender-2.60a-libav-0.7.patch
===================================================================
--- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2011-10-24 20:09:01.000000000 +0200
+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp	2011-11-13 12:34:01.000000000 +0100
@@ -40,6 +40,7 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>
+#include <libavutil/mathematics.h>
 #include "ffmpeg_compat.h"
 }
 
@@ -57,10 +58,14 @@
 {
 	static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
 
-	if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str()))
-		AUD_THROW(AUD_ERROR_FFMPEG, context_error);
+	m_formatCtx = avformat_alloc_context();
+        if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
 
-	m_outputFmt = m_formatCtx->oformat;
+        m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
+	if (!m_outputFmt) {
+            avformat_free_context(m_formatCtx);
+            AUD_THROW(AUD_ERROR_FFMPEG, context_error);
+        }
 
 	switch(codec)
 	{





Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in media-gfx/blender: ChangeLog blender-2.60a.ebuild blender-2.57-r1.ebuild
Next by thread:
gentoo-x86 commit in dev-lang/swig: ChangeLog swig-2.0.4-r1.ebuild
Previous by date:
gentoo-x86 commit in media-gfx/blender: ChangeLog blender-2.60a.ebuild blender-2.57-r1.ebuild
Next by date:
gentoo-x86 commit in dev-lang/swig: ChangeLog swig-2.0.4-r1.ebuild


Updated Jun 26, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.