fix build with ffmpeg git: do not use internal symbols

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

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 5bc97b2967b91de05d981da91243d693567210da..cab7dea40d59863b83e759d3d0a002aee98d42be 100644 (file)
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.74 2011/10/31 21:55:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.75 2011/11/28 13:35:24 aballier Exp $
+
+  28 Nov 2011; Alexis Ballier <aballier@gentoo.org> mlt-0.7.6.ebuild,
+  +files/mlt-0.7.6-ffmpeg.patch:
+  fix build with ffmpeg git: do not use internal symbols
 
 *mlt-0.7.6 (31 Oct 2011)
 

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 54536df2bb0a48af60a6073aae84191834697f4d..7a590c3639395a1df9bf240f27d3b706a4cf255f 100644 (file)
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 DIST mlt-0.5.10.tar.gz 819471 RMD160 015053ddb98175adc905d2ccf29ae962f295a9bb SHA1 e0b3d8f77ad6d97d6495614e78dfbbb531e70f77 SHA256 106636540cdf44f670937b8df549ea2c988a27d05e14d4a8670f9b6af5a0d19e
 DIST mlt-0.7.2.tar.gz 901572 RMD160 50d4e7601338a94bf30eac78d0b39422bf4f522e SHA1 ada5bbe9c5d38ff2f42a5d89c0cdb5a56586a699 SHA256 4b6212b6ab137220af93333195ae5deee4bf7b294d680b43b1b074a4c63e0131
 DIST mlt-0.7.6.tar.gz 1024353 RMD160 898256dfbbda158f51796a7d4468a6a54b9b246d SHA1 f23c8bddb9b1f406c3cfcd155e74f8d9d37b5120 SHA256 f8ea8590417ea2b5543a495f2edc30636d3931932deee7a4e0d8516e9c2b58ae
 EBUILD mlt-0.5.10.ebuild 4456 RMD160 d8caa63396701fbf34f00d1c3435b80c2e34a59e SHA1 05ff0316c1ca33a1a08b48239d693855334dfef2 SHA256 679a3206e4eb1efd3fe60e86f730fd2b85a6c1645ebcafcd4482c5d651d16b45
 EBUILD mlt-0.7.2.ebuild 4455 RMD160 bfbc23069c4183f4d6a176a15d69663debd83b37 SHA1 c8435964f048bf9f012c91bd2c1e6abb565ebe4c SHA256 1191921ef3836e87f8f7af4f74e6fecd212745dde2b384ae452b8b29d4a042b6
-EBUILD mlt-0.7.6.ebuild 4466 RMD160 b60703f14ebd5c1bb558bd23009448d0b7b19360 SHA1 8ede6899b4cfb64422164d812b951308d70eb9cb SHA256 e23b3ef59c3aa68c35a6e3046cb312f8af10f4556cb73819027d363fdcd04e57
-MISC ChangeLog 11581 RMD160 d3b8b19880675828c023ca47f2edd1fc21e03a98 SHA1 92154a187d0543ee789c42a99b96795861f46dbb SHA256 6da677a0c180c5a8391b658865d2de4ed93ae00a71f2a3ed563f9a25fb900829
+EBUILD mlt-0.7.6.ebuild 4508 RMD160 e2fd6216512be4724a3e92d54294047f0dd4d01a SHA1 c8690aa3f9b11310f85bfad24811eb2960679f6e SHA256 df0ed0ea3fa7260dad3285439be7865cf70d19a7f21e2df1eab670296e46ae8a
+MISC ChangeLog 11741 RMD160 e56df10f6022248e748d4d28e785bf9296629d60 SHA1 0bb526c75d0636ddb21e377374f2951b2bf378f4 SHA256 5d897724014fb0f31fe273b28b441301d59980e9eb5e707b7d7ee27a6c57f8b6
 MISC metadata.xml 902 RMD160 9cbaf3b801eeda6ba3733ffdc947eec947c9c905 SHA1 564c50101ea02bc5b3adc1c94a59962e8652e4f5 SHA256 42ad9c42cec4fbde252f7bfb7656012f7b452525679de4a644697bcbea73b7e6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOrxlTAAoJENwGBM22xffepPkP/jIH1EAu6d5HvdwHHXOZjoht
-TE44f8ahC/FKh2MSKcLBdGuLcxvqI27AueVMyAVn77/cM0QT5uraFMmW6URMp2zh
-xXoF3I8iJjoW4TgyiBVt32l23Kc9JPpPcWezvWND+7jytlS6vynYsIoJi+3GYQUb
-cWmw8AMZeARr9N0L5cseCr21qN158Cs1SGsmNMzhhhUx/nkUI6e9o1UtaP92aYqr
-P5TBlMULi7GsSubbmBvGh66k4pO0BvaKpZ0McMSpnFGZsxdOtbsj6a9AW74j1Koc
-2wANrvHsWwT5F7KWaTYfF8xDuxsA7g03yQVIIHsTgwI0A6o280fAl6RlPG7iRKwt
-oPsuc7w6GQNDAa5C1Q9WaPONaP74AftH9M/AC1NdJefSlLWHAfcy8M22O8rY8Jcq
-B1mxoFrl/sOaYdh9KCIufvgrM00RJ57nrdchrnMkx+4sQILbo1CB7Gj9Xy3s1NVS
-1m1HwC7kF0mTsVJfICwHFj28AfhYhvXkEwT9qsBQuq5aBGifWLnRz8uRPYiM6WZX
-CDlMK+tFnIUmH23DPJhcPYBIBKOSPHSkrm7VlgXYXZuHn6acfaPwgJjHpWPq0VOp
-P1FBMErSWrLwBq+9k4RWsOgbjuzW9JUZCP3rO9FUN+NgXUZASCf3dFcF9O5wFCB0
-YC3k7cwxKr014CDEfmo3
-=+BLd
+iEYEARECAAYFAk7TjiEACgkQvFcC4BYPU0p8TACgrlRhW0hwW8oIvFnSAjvTfG5S
+zHIAoLCmRNV6qoamVkeJNEYmG2bCY++W
+=dMjw
 -----END PGP SIGNATURE-----

diff --git a/media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch b/media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch
new file mode 100644 (file)
index 0000000..2fb45d5
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.7.6-ffmpeg.patch
@@ -0,0 +1,33 @@
+Do not use ffmpeg internal symbols.
+
+Index: mlt-0.7.6/src/modules/avformat/filter_avdeinterlace.c
+===================================================================
+--- mlt-0.7.6.orig/src/modules/avformat/filter_avdeinterlace.c
++++ mlt-0.7.6/src/modules/avformat/filter_avdeinterlace.c
+@@ -26,7 +26,9 @@
+ 
+ // ffmpeg Header files
+ #include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
+ 
++#if 0
+ #ifdef USE_MMX
+ #include "mmx.h"
+ #else
+@@ -293,6 +295,7 @@ static int mlt_avpicture_deinterlace(AVP
+ #endif
+     return 0;
+ }
++#endif
+ 
+ /** Do it :-).
+ */
+@@ -318,7 +321,7 @@ static int filter_get_image( mlt_frame f
+ 
+               // Fill the picture
+               avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height );
+-              mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
++              avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height );
+ 
+               // Free the picture
+               mlt_pool_release( output );

diff --git a/media-libs/mlt/mlt-0.7.6.ebuild b/media-libs/mlt/mlt-0.7.6.ebuild
index 255677ac92be8b82674345e5566636cf08f9d117..06acef739fb2ac6f57bf6f6906e7666de5c57b96 100644 (file)
--- a/media-libs/mlt/mlt-0.7.6.ebuild
+++ b/media-libs/mlt/mlt-0.7.6.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-libs/mlt/mlt-0.7.6.ebuild,v 1.1 2011/10/31 21:55:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.6.ebuild,v 1.2 2011/11/28 13:35:24 aballier Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
@@ -60,7 +60,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.6-ffmpeg.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