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

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

4 files changed, 82 insertions, 8 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/Manifest b/media-video/cinelerra/Manifest
index 896a9a071821..8c9832dd91c4 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX cinelerra-ffmpeg.patch 1813 RMD160 c384407c69f049b1c451fdc8a90307d8c434675a SHA1 097eeb594b7f1cb61fac13aface70b9d2cae9c64 SHA256 cb9a4672f998bba4a960ff200b5750c4586d32878e06cd17a16f8cc9eaa71426
+AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda
 DIST cinelerra-20080717.tar.lzma 21734783 RMD160 2d55e56da3ec963542301e59e9dbadd527a7c88b SHA1 cd51ca3cace68a33d3b6682890b3205352e9616e SHA256 537b154f9045016c17636ce9f200a9fc309920989f163af68a7fb0c2fe81e981
 DIST cinelerra-20090210.tar.lzma 21049396 RMD160 346353eec1a796698cb95b3066058344b244416c SHA1 68e40b1de7d17da70d1087af339146be3d00fd0f SHA256 35daee11a42dec974ac45de54773022463b3daeb61da4590a9e9d57fce3298ea
 EBUILD cinelerra-20080717.ebuild 2576 RMD160 c4d08cf26afc694239f3879ab7791b6d16234d75 SHA1 f37d6472cf6463faa485045b0354a38b5ebf62ae SHA256 937f21e4f21ecf094256459c5dea00a87c594b614ba558e03a2889e6f915c22f
-EBUILD cinelerra-20090210.ebuild 2449 RMD160 fa099a7cd0b35cde9304cf9890e65bd0572b43f0 SHA1 df4c3406b904eb493a44565683b044d94bc57a85 SHA256 95a29b6f6b8d4d6dcab33914041750aa2025ab3df96221e1f391d7afb241f21a
-MISC ChangeLog 8938 RMD160 568e652626e7cd999a22ec444a1ddc0aa6e813f3 SHA1 f61229c113ca314c6cfd100fcfb9b545e380b69b SHA256 8c963ee613f656ed1f1f3ab71bd99d690f7329b4ddcd31aafe9414a3e2037d2a
+EBUILD cinelerra-20090210.ebuild 2498 RMD160 70862c761c011ed53c53d85da5588cf39de12434 SHA1 0cf175574429e520007d4a5956c442cbee382794 SHA256 2bb273cac8386ab69899264f7ba7642ee706f851143449d633ad2080b15e0a58
+MISC ChangeLog 9155 RMD160 df5b9633a16f49da642b9697f206dfb92317cdc1 SHA1 28ad13940f2fc21bb9af69bcf5324447b94f581d SHA256 fd413fe82de1d64f941d569c796a3c0c1ec9e2bf1d52ad0c59441735a3620f2e
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmR7zoACgkQr2QksT29OyCjfACfURd5O3FFi/2KRRamm+yYDHQG
-lPoAnjg7lH9DrcB1JJToElSAVfGzg3X6
-=UJ/H
+iEYEARECAAYFAknlbUAACgkQvFcC4BYPU0qTeACgkjfgJYFpAah8ISIZZ78W7OV0
+0fYAoLLzjIOuE/4ZRorpWyDMIWyB4bEP
+=UkmL
 -----END PGP SIGNATURE-----
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: