Update ebuild to fix #369931 and #374339 and related

(Portage version: 2.1.10.32/cvs/Linux x86_64)

4 files changed, 58 insertions, 2 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index d1e288f05b90..ee1559e7db58 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.207 2011/11/01 20:37:44 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.208 2011/11/07 21:51:39 lu_zero Exp $
+
+  07 Nov 2011; Luca Barbato <lu_zero@gentoo.org> blender-2.57-r1.ebuild,
+  +files/blender-2.57-enable_site_module.patch,
+  files/blender-2.57-libav-0.7.patch:
+  Update ebuild to fix #369931 and #374339
 
   01 Nov 2011; Sebastian Pipping <sping@gentoo.org> blender-2.57-r1.ebuild:
   Bump scons dependency to 2.0.1-r1 (bug #388861)
diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild
index b5275c0e6f4b..395b8fbbb8a0 100644
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ b/media-gfx/blender/blender-2.57-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.7 2011/11/01 20:37:44 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.8 2011/11/07 21:51:39 lu_zero Exp $
 
 PYTHON_DEPEND="3:3.2"
 
@@ -128,6 +128,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-libav-0.7.patch
 	epatch "${FILESDIR}"/${P}-CVE-2009-3850-v2.patch
 	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-enable_site_module.patch
 
 	# OpenJPEG
 	einfo "Removing bundled OpenJPEG ..."
diff --git a/media-gfx/blender/files/blender-2.57-enable_site_module.patch b/media-gfx/blender/files/blender-2.57-enable_site_module.patch
new file mode 100644
index 000000000000..c38be79bd16f
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.57-enable_site_module.patch
@@ -0,0 +1,32 @@
+--- source/blender/python/intern/bpy_interface.c
++++ source/blender/python/intern/bpy_interface.c
+@@ -244,11 +244,6 @@
+ 
+ 	bpy_python_start_path(); /* allow to use our own included python */
+ 
+-	/* Python 3.2 now looks for '2.57/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
+@@ -1773,7 +1773,6 @@
+ 	STR_String pname = progname;
+ 	Py_SetProgramName(pname.Ptr());
+ #endif
+-	Py_NoSiteFlag=1;
+ 	Py_FrozenFlag=1;
+ 
+ 	/* must run before python initializes */
+@@ -1843,7 +1842,6 @@
+ 	STR_String pname = progname;
+ 	Py_SetProgramName(pname.Ptr());
+ #endif
+-	Py_NoSiteFlag=1;
+ 	Py_FrozenFlag=1;
+ 
+ 	initPyTypes();
diff --git a/media-gfx/blender/files/blender-2.57-libav-0.7.patch b/media-gfx/blender/files/blender-2.57-libav-0.7.patch
index cc2f399962dd..7b4ca47ed235 100644
--- a/media-gfx/blender/files/blender-2.57-libav-0.7.patch
+++ b/media-gfx/blender/files/blender-2.57-libav-0.7.patch
@@ -276,3 +276,21 @@ diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h blend
  #include <libswscale/swscale.h>
  #include "DNA_listBase.h"
  #include "BLI_threads.h"
+diff -burN blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c /var/tmp/portage/media-gfx/blender-2.57-r1/work/blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c
+--- blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c	2011-11-07 13:17:59.001736099 -0800
++++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c	2011-11-07 13:18:35.726734562 -0800
+@@ -1101,12 +1101,12 @@
+ 	switch (o->type) {
+ 	case FF_OPT_TYPE_INT:
+ 	case FF_OPT_TYPE_INT64:
+-		val.i = o->default_val;
++		val.i = o->default_val.dbl;
+ 		idp_type = IDP_INT;
+ 		break;
+ 	case FF_OPT_TYPE_DOUBLE:
+ 	case FF_OPT_TYPE_FLOAT:
+-		val.f = o->default_val;
++		val.f = o->default_val.dbl;
+ 		idp_type = IDP_FLOAT;
+ 		break;
+ 	case FF_OPT_TYPE_STRING: