Fix build with libavutil 50 by not using pixel formats that have been deprecated for years.

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 75 insertions, 2 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 3aaacbd188d2..543edf008b15 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.34 2009/02/10 21:18:46 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.35 2009/04/15 05:14:34 aballier Exp $
+
+  15 Apr 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/cinelerra-libavutil50.patch, cinelerra-20090210.ebuild:
+  Fix build with libavutil 50 by not using pixel formats that have been
+  deprecated for years.
 
 *cinelerra-20090210 (10 Feb 2009)
 
diff --git a/media-video/cinelerra/cinelerra-20090210.ebuild b/media-video/cinelerra/cinelerra-20090210.ebuild
index 4861b63e85c7..5d3296c57598 100644
--- a/media-video/cinelerra/cinelerra-20090210.ebuild
+++ b/media-video/cinelerra/cinelerra-20090210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.1 2009/02/10 21:18:46 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.2 2009/04/15 05:14:34 aballier Exp $
 
 inherit autotools multilib eutils
 
@@ -57,6 +57,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${PN}-libavutil50.patch"
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/media-video/cinelerra/files/cinelerra-libavutil50.patch b/media-video/cinelerra/files/cinelerra-libavutil50.patch
new file mode 100644
index 000000000000..f2f4b312755a
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-libavutil50.patch
@@ -0,0 +1,67 @@
+Fix build with libavutil 50, ie ffmpeg trunk by not using pixel formats that
+have been deprecated for years.
+
+
+Index: cinelerra-20090210/cinelerra/ffmpeg.C
+===================================================================
+--- cinelerra-20090210.orig/cinelerra/ffmpeg.C
++++ cinelerra-20090210/cinelerra/ffmpeg.C
+@@ -70,11 +70,11 @@ PixelFormat FFMPEG::color_model_to_pix_f
+ 	switch (color_model) 
+ 		{ 
+ 		case BC_YUV422: 
+-			  return PIX_FMT_YUV422;
++			  return PIX_FMT_YUYV422;
+ 		case BC_RGB888:
+ 			return PIX_FMT_RGB24;
+ 		case BC_BGR8888:  // NOTE: order flipped
+-			return PIX_FMT_RGBA32;
++			return PIX_FMT_RGB32;
+ 		case BC_BGR888:
+ 			return PIX_FMT_BGR24;
+ 		case BC_YUV420P: 
+@@ -95,11 +95,11 @@ PixelFormat FFMPEG::color_model_to_pix_f
+ int FFMPEG::pix_fmt_to_color_model(PixelFormat pix_fmt) {
+ 	switch (pix_fmt) 
+ 		{ 
+-		case PIX_FMT_YUV422:
++		case PIX_FMT_YUYV422:
+ 			return BC_YUV422;
+ 		case PIX_FMT_RGB24:
+ 			return BC_RGB888;
+-		case PIX_FMT_RGBA32:
++		case PIX_FMT_RGB32:
+ 			return BC_BGR8888;
+ 		case PIX_FMT_BGR24:
+ 			return BC_BGR888;
+@@ -286,7 +286,7 @@ int FFMPEG::convert_cmodel(AVPicture *pi
+ 	// make an intermediate temp frame only if necessary
+ 	int cmodel_in = pix_fmt_to_color_model(pix_fmt_in);
+ 	if (cmodel_in == BC_TRANSPARENCY) {
+-		if (pix_fmt_in == PIX_FMT_RGBA32) {
++		if (pix_fmt_in == PIX_FMT_RGB32) {
+ 			// avoid infinite recursion if things are broken
+ 			printf("FFMPEG::convert_cmodel pix_fmt_in broken!\n");
+ 			return 1;
+Index: cinelerra-20090210/quicktime/qtffmpeg.c
+===================================================================
+--- cinelerra-20090210.orig/quicktime/qtffmpeg.c
++++ cinelerra-20090210/quicktime/qtffmpeg.c
+@@ -225,7 +225,7 @@ static int get_chroma_factor(quicktime_f
+ 		case PIX_FMT_YUV420P:
+ 			return 4;
+ 			break;
+-		case PIX_FMT_YUV422:
++		case PIX_FMT_YUYV422:
+ 			return 2;
+ 			break;
+ 		case PIX_FMT_YUV422P:
+@@ -424,7 +424,7 @@ int quicktime_ffmpeg_decode(quicktime_ff
+ 		case PIX_FMT_YUV420P:
+ 			input_cmodel = BC_YUV420P;
+ 			break;
+-		case PIX_FMT_YUV422:
++		case PIX_FMT_YUYV422:
+ 			input_cmodel = BC_YUV422;
+ 			break;
+ 		case PIX_FMT_YUV422P: