fix build with libavcodec 54, ie, ffmpeg git

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 33 insertions, 8 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index cc962900d208..2152da0fa774 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.84 2012/02/26 00:54:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.85 2012/02/26 12:52:01 aballier Exp $
+
+  26 Feb 2012; Alexis Ballier <aballier@gentoo.org> mlt-0.7.8.ebuild,
+  +files/mlt-0.7.8-libavcodec54.patch:
+  fix build with libavcodec 54, ie, ffmpeg git
 
 *mlt-0.7.8 (26 Feb 2012)
 
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index dffa0c1073f2..e6ae0156f5e2 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 AUX mlt-0.5.4-asneeded.patch 338 RMD160 1fd1f17c6461fa518a621064a9d1f5a981e94059 SHA1 06784b1c39a9766e45c9b29e9c7a03916472e21e SHA256 9331f20822eb6cb0ed7e20952b0e37cb3e9a5df0203d1ab6361b4289a6c0cba8
 AUX mlt-0.7.2-ruby-link.patch 680 RMD160 f63b85806e58561e43ffad0162393ea77e01e728 SHA1 7bb51abe6dd716369f39272867eb242b1cb42e29 SHA256 fbcf41da78bc150afd2fcc5394eda2022d2c19d7b1cb788910b443b64d0cdd56
 AUX mlt-0.7.6-ffmpeg.patch 939 RMD160 11f4bf7f72c6b501df8973f11c725c30ce8580fc SHA1 2419d65dc8cc9f0322cd2746b3835e590656fe44 SHA256 f4a30fafe929c599077b8c2d8d8b4022449c628b83dd825e350bcbc0ed1c352f
+AUX mlt-0.7.8-libavcodec54.patch 677 RMD160 652a958bfba65d621aa321a14eb185c3a32d9ff5 SHA1 638358345e1a8e67ed0fa16d46ed3362ae1740c8 SHA256 ad720784b728699eada59f44be2f63a834b16ce076acce36f7f74bba1b55b125
 DIST mlt-0.5.10.tar.gz 819471 RMD160 015053ddb98175adc905d2ccf29ae962f295a9bb SHA1 e0b3d8f77ad6d97d6495614e78dfbbb531e70f77 SHA256 106636540cdf44f670937b8df549ea2c988a27d05e14d4a8670f9b6af5a0d19e
 DIST mlt-0.7.6.tar.gz 1024353 RMD160 898256dfbbda158f51796a7d4468a6a54b9b246d SHA1 f23c8bddb9b1f406c3cfcd155e74f8d9d37b5120 SHA256 f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae
 DIST mlt-0.7.8.tar.gz 1106625 RMD160 8edaeba84ca91b002c85e8582b7b0fa8d0286a86 SHA1 2d55b16918284ffadd5eae6eed1c5f0a12669d32 SHA256 95833b2746e2d71dd42f6163e1a5d863c7d4772cc344a840f5555d0dc1946e43
 EBUILD mlt-0.5.10.ebuild 4456 RMD160 d8caa63396701fbf34f00d1c3435b80c2e34a59e SHA1 05ff0316c1ca33a1a08b48239d693855334dfef2 SHA256 679a3206e4eb1efd3fe60e86f730fd2b85a6c1645ebcafcd4482c5d651d16b45
 EBUILD mlt-0.7.6-r1.ebuild 4650 RMD160 4c061fb5492f69c39f7bd7e008d5880b6f91568c SHA1 d19dc258829558898c405ba45321285195e18356 SHA256 0dd8a9f2f1aecc67feaaf1a304864dd8096d542f6fc2a775fada197e1526c2a6
-EBUILD mlt-0.7.8.ebuild 4756 RMD160 214e080d098265bf3a82b487b1ddf149f9b8f8d7 SHA1 37d7b7e25852726301b0961a845715a8e6b4f8f8 SHA256 2142a3ca13b94ab079265a4b2ba3121b4f9f8e50261034da02d91a46d1d39017
-MISC ChangeLog 13022 RMD160 88b177ad4ee0fe4c3d9a3fbc2ab3b303296dd484 SHA1 10bfbe3ffc8b889b8840591c2b7fb35226aabc3c SHA256 d0f9e936d5b959b4c5d981fb814001525269279b5bff2bf23cf82064d0e74d80
+EBUILD mlt-0.7.8.ebuild 4805 RMD160 78603c940396e918d460a32baf872778cc2dc5da SHA1 fa97f0f208313c43fcc9847f7729281cf0bc69b4 SHA256 3c0c8d2ed9dafffa42c49ca33af768f6f7fa42de95d95cd10b142c0764941c9c
+MISC ChangeLog 13179 RMD160 f084d5c7519ca0170cb78de7ccdfe580288e24b3 SHA1 ed80c4f11235f0a5746655cb28a93a8e676fae9b SHA256 aadefb28c5fcb52baf3f718761baeb11256e79cf8e2d91576d76964fec188da8
 MISC metadata.xml 1130 RMD160 680cc6bdb4ba65bc7eaffbab0a2ab17065948c0f SHA1 877248266e1d5090524e4182939a637b081055a6 SHA256 fbd5e5c1f43b4e3729ffb08a460281d9214e2ce42b2ff0b24f6ace960e65f48a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9JgrAACgkQvFcC4BYPU0qOZgCgvzHkW75ZRgZkDjLpCBfw8fsM
-i30AoJ58rdZQWbeAwvGhh5XC1380hCOk
-=xANg
+iEYEARECAAYFAk9KKvYACgkQvFcC4BYPU0qJwQCfUlF5UA0mq0RMa24g2ypoOS7X
+G+IAn0oURy2lh6d6vO8USGUQTdgADCvB
+=Yfj6
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch b/media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch
new file mode 100644
index 000000000000..4d8d4e8c3ded
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.7.8-libavcodec54.patch
@@ -0,0 +1,19 @@
+Index: mlt-0.7.8/src/modules/avformat/vdpau.c
+===================================================================
+--- mlt-0.7.8.orig/src/modules/avformat/vdpau.c
++++ mlt-0.7.8/src/modules/avformat/vdpau.c
+@@ -152,14 +152,12 @@ static int vdpau_get_buffer( AVCodecCont
+ 			frame->reordered_opaque = codec_context->reordered_opaque;
+ 			if ( frame->reference )
+ 			{
+-				frame->age = self->vdpau->ip_age[0];
+ 				self->vdpau->ip_age[0] = self->vdpau->ip_age[1] + 1;
+ 				self->vdpau->ip_age[1] = 1;
+ 				self->vdpau->b_age++;
+ 			}
+ 			else
+ 			{
+-				frame->age = self->vdpau->b_age;
+ 				self->vdpau->ip_age[0] ++;
+ 				self->vdpau->ip_age[1] ++;
+ 				self->vdpau->b_age = 1;
diff --git a/media-libs/mlt/mlt-0.7.8.ebuild b/media-libs/mlt/mlt-0.7.8.ebuild
index dd737dec0e9c..01cd7c52bd8f 100644
--- a/media-libs/mlt/mlt-0.7.8.ebuild
+++ b/media-libs/mlt/mlt-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.8.ebuild,v 1.1 2012/02/26 00:54:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.8.ebuild,v 1.2 2012/02/26 12:52:01 aballier Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -65,7 +65,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.patch
+	epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.patch \
+		"${FILESDIR}"/${PN}-0.7.8-libavcodec54.patch
 	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
 	for x in python lua; do
 		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die