Make blender use swscale

Package-Manager: portage-2.1.3.3

4 files changed, 60 insertions, 11 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index e14d2ea82009..f1fef7a8ecd1 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.118 2007/07/22 10:04:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.119 2007/08/07 23:31:21 lu_zero Exp $
+
+  07 Aug 2007; Luca Barbato <lu_zero@gentoo.org>
+  +files/blender-2.44-swscale.patch, blender-2.44.ebuild:
+  make blender use swscale
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   blender-2.41-r1.ebuild, blender-2.42.ebuild, blender-2.42a-r1.ebuild,
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 75cc378ce6e1..f8e77841382b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -6,6 +6,10 @@ AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108
 MD5 969160ddcac4ca5bd002174829a4bc9c files/blender-2.44-scriptsdir.patch 2586
 RMD160 8e80859edf1fae2f401b326be4cb939108879999 files/blender-2.44-scriptsdir.patch 2586
 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4 files/blender-2.44-scriptsdir.patch 2586
+AUX blender-2.44-swscale.patch 1406 RMD160 a86dcdc5566c20856208510f220facd79290b88f SHA1 90ac9e74e0741dde4f22a328e92a38103e0351b4 SHA256 9e3ed58b0a8c33c804b13273aa6fb33099a493913a52a1782a300f1eb1b72dd7
+MD5 285545d1e546224d3d5acd46056ecb02 files/blender-2.44-swscale.patch 1406
+RMD160 a86dcdc5566c20856208510f220facd79290b88f files/blender-2.44-swscale.patch 1406
+SHA256 9e3ed58b0a8c33c804b13273aa6fb33099a493913a52a1782a300f1eb1b72dd7 files/blender-2.44-swscale.patch 1406
 AUX blender.desktop 197 RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 SHA1 d0387c8e525a7c24b1a150a36fc6152874d0136e SHA256 dff04dfaa1c1105099717a04af9c6ad028c7cd5a2e21d72f6dc7182ca703cff1
 MD5 b8e304980dc2bfd9a7157037d6ead44b files/blender.desktop 197
 RMD160 6d5bf65f7cdce71123f193b0912c42e212832af7 files/blender.desktop 197
@@ -37,14 +41,14 @@ EBUILD blender-2.43.ebuild 3612 RMD160 44d5295f89061dbb9134d018d916460570b56e79
 MD5 69eaa1366e0fdaf01d8175a5714d1969 blender-2.43.ebuild 3612
 RMD160 44d5295f89061dbb9134d018d916460570b56e79 blender-2.43.ebuild 3612
 SHA256 67ff46dd98e2fafc17888c28bbf81e51c04fcac40a46723e811166ec402c88c1 blender-2.43.ebuild 3612
-EBUILD blender-2.44.ebuild 3517 RMD160 3b562a2d1ead582ffbd2c066ad734b70f4d846e5 SHA1 58aecac668676bc9073ffc123c80ec7510650345 SHA256 e6f704d8fb0868185f574c84cb1f36cbf9017cd4596f3d464f04bab233d90b12
-MD5 ab289f1cbf2ac43dc90520dc302d72d3 blender-2.44.ebuild 3517
-RMD160 3b562a2d1ead582ffbd2c066ad734b70f4d846e5 blender-2.44.ebuild 3517
-SHA256 e6f704d8fb0868185f574c84cb1f36cbf9017cd4596f3d464f04bab233d90b12 blender-2.44.ebuild 3517
-MISC ChangeLog 16781 RMD160 18034a3a9f30eb0b6c3463c9e829cea2727edd8c SHA1 598101f24c0f61b1a12482a0fd4268b0ae4c7266 SHA256 6a582e3901b6012efa34592d5cc6d1d4ea1830e0ed60d4e177822f7cc0e790bd
-MD5 ff1b45a4d5a4853a3eeccbd15dcf2279 ChangeLog 16781
-RMD160 18034a3a9f30eb0b6c3463c9e829cea2727edd8c ChangeLog 16781
-SHA256 6a582e3901b6012efa34592d5cc6d1d4ea1830e0ed60d4e177822f7cc0e790bd ChangeLog 16781
+EBUILD blender-2.44.ebuild 3547 RMD160 51d1256818daa7826666b584b4098a851c9330ea SHA1 7e15c7a9c99b9b4e154e4ffb6c788d3f44963f53 SHA256 97831a85a9372cc927e8bee51e21268eaa7c8690c5708e5d5158d9cd9f9fa141
+MD5 b9ea5da16209e9b393e5fd49cf1fbb47 blender-2.44.ebuild 3547
+RMD160 51d1256818daa7826666b584b4098a851c9330ea blender-2.44.ebuild 3547
+SHA256 97831a85a9372cc927e8bee51e21268eaa7c8690c5708e5d5158d9cd9f9fa141 blender-2.44.ebuild 3547
+MISC ChangeLog 16914 RMD160 8a63016db73fae91ef2acb14b310274d435a50d5 SHA1 b018cd08cff470510b5365dd3f0087c6ac2e334a SHA256 ce0f73005c0e4f14af45e5560cd702eac63206526a3f9e3f12675eec36287483
+MD5 1e287b292453748efa8242dd4fc99e77 ChangeLog 16914
+RMD160 8a63016db73fae91ef2acb14b310274d435a50d5 ChangeLog 16914
+SHA256 ce0f73005c0e4f14af45e5560cd702eac63206526a3f9e3f12675eec36287483 ChangeLog 16914
 MISC metadata.xml 492 RMD160 c477917476fbde6356586768276eda1ea31ae3ea SHA1 4a109fbded83a3f6c403ab5f3ec20e7113c1a26c SHA256 0ef00c095e68d12b312f8558b8909b4ae633717cf12932d7a4e479faf7fb9e18
 MD5 cfcd6135fc23767decafee2a97f5ac0a metadata.xml 492
 RMD160 c477917476fbde6356586768276eda1ea31ae3ea metadata.xml 492
diff --git a/media-gfx/blender/blender-2.44.ebuild b/media-gfx/blender/blender-2.44.ebuild
index 44605b822653..8ac326dfb4b3 100644
--- a/media-gfx/blender/blender-2.44.ebuild
+++ b/media-gfx/blender/blender-2.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.4 2007/07/22 10:04:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.44.ebuild,v 1.5 2007/08/07 23:31:21 lu_zero Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -54,12 +54,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/release/plugins
 	chmod 755 bmake
-	rmdir include
 	cp -pPR ${S}/source/blender/blenpluginapi include
 
 	cd ${S}
 	epatch ${FILESDIR}/blender-2.37-dirs.patch
 	epatch ${FILESDIR}/blender-2.44-scriptsdir.patch
+	epatch ${FILESDIR}/blender-2.44-swscale.patch
 
 	if use ffmpeg ; then
 		cd ${S}/extern
diff --git a/media-gfx/blender/files/blender-2.44-swscale.patch b/media-gfx/blender/files/blender-2.44-swscale.patch
new file mode 100644
index 000000000000..08bdb65bae98
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.44-swscale.patch
@@ -0,0 +1,41 @@
+Index: writeffmpeg.c
+===================================================================
+--- blender.orig/source/blender/blenkernel/intern/writeffmpeg.c	(revision 11354)
++++ blender/source/blender/blenkernel/intern/writeffmpeg.c	(working copy)
+@@ -32,6 +32,7 @@
+ #include <ffmpeg/avformat.h>
+ #include <ffmpeg/avcodec.h>
+ #include <ffmpeg/rational.h>
++#include <ffmpeg/swscale.h>
+ 
+ #if LIBAVFORMAT_VERSION_INT < (49 << 16)
+ #define FFMPEG_OLD_FRAME_RATE 1
+@@ -258,6 +259,7 @@
+ static AVFrame* generate_video_frame(uint8_t* pixels) 
+ {
+ 	uint8_t* rendered_frame;
++	static struct SwsContext *img_convert_ctx;
+ 
+ 	AVCodecContext* c = get_codec_from_stream(video_stream);
+ 	int width = c->width;
+@@ -317,8 +319,18 @@
+ 	}
+ 
+ 	if (c->pix_fmt != PIX_FMT_RGBA32) {
+-		img_convert((AVPicture*)current_frame, c->pix_fmt, 
+-			(AVPicture*)rgb_frame, PIX_FMT_RGBA32, width, height);
++		if (img_convert_ctx == NULL)
++			img_convert_ctx = sws_getContext(c->width, c->height,
++							 PIX_FMT_RGBA32,
++							 c->width, c->height,
++							 c->pix_fmt,
++							 SWS_BICUBIC,
++							 NULL, NULL, NULL);
++		sws_scale(img_convert_ctx, rgb_frame->data,
++			  rgb_frame->linesize, 0, c->height, 
++			  current_frame->data, current_frame->linesize);
++//		img_convert((AVPicture*)current_frame, c->pix_fmt, 
++//			(AVPicture*)rgb_frame, PIX_FMT_RGBA32, width, height);
+ 		delete_picture(rgb_frame);
+ 	}
+ 	return current_frame;