backport upstream patch to link with libdl when using frei0r, bug #409047

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

4 files changed, 33 insertions, 7 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 24c2d471c118..8f3f4a037e7c 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.536 2012/04/05 11:59:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.537 2012/04/08 14:37:03 aballier Exp $
+
+  08 Apr 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.2.ebuild,
+  +files/freiordl.patch:
+  backport upstream patch to link with libdl when using frei0r, bug #409047
 
   05 Apr 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.2.ebuild,
   ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 91f4961cf901..626a553f4758 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA1
 
 AUX ffmpeg-0.7.6-fix_ppc64_32ul.patch 1094 RMD160 b765f1f8420701e6d9447391dd498f6807b2e2e7 SHA1 f4fd276e9a88d815657282d67b716dc793f30988 SHA256 b6e60ba7f9d179b8b2ba03cf74694d1e92e6fc6d4626cda258ab1af50e0afea4
+AUX freiordl.patch 611 RMD160 e11a21202acaae10e9c1f626c271c59cd85828db SHA1 3a434ef85cd32d9cf5be4acccdfe6a9d1f98e4bd SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf
 DIST ffmpeg-0.10.2.tar.bz2 5780204 RMD160 b9dd617935e106e4a1980167bdb7ec8d76d3f2f7 SHA1 743f44a71f93b14c9b26ca2424b0da8457cef4be SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
 DIST ffmpeg-0.10.tar.bz2 5778962 RMD160 a60568d4e8bd1a44a2c986e0648cfacba766bcd4 SHA1 a3a7fe25db760a99d51266b33386da9c8552feef SHA256 43596aa76d1a0fab6d42927bf60383405de2bca8fbc740c2012877559ae17ff9
 DIST ffmpeg-0.7.8.tar.bz2 4530406 RMD160 8f69a6bc5caaba4e3d440c2d5dc96a946454a52c SHA1 df4983c028a61d4bf3baceab3bae535b91b8928a SHA256 548197968e69b732c12b2cad3173eb6933a9573a7b1f5b29be36d31b9977c9f3
-EBUILD ffmpeg-0.10.2.ebuild 8461 RMD160 5c5c83be8538554c777780fd57b63dfd036cdc77 SHA1 2027c5d9eca66c41a043205a3e0302c993974e26 SHA256 215c66071ee15e8b805a05254dc17333bfcc6ccd7bb28826d1c529caa76c648d
+EBUILD ffmpeg-0.10.2.ebuild 8498 RMD160 f2a657679274a5801c19379f5a1d3ac9a92ce007 SHA1 91989ddc6b35e9581b7e9a024f8980e84d82cf1d SHA256 8ea5f9b095ab61c9ff932160a2c2ff8ac47f3c3a12809933b997956e52da177d
 EBUILD ffmpeg-0.10.ebuild 8264 RMD160 7f43adf0a8d8c93c7b09e901f3b0a6a8feaf1a76 SHA1 65f60beb6a5e7f86b599a6d790050b4d17863e73 SHA256 cb57b9291b6fad21673e1e1c10ce36d2971846d4747f862644f02968b5563d22
 EBUILD ffmpeg-0.7.8.ebuild 8434 RMD160 ee37ec983306aaa4bf464a6bcccd7072c8490052 SHA1 7712cefb7ac062070f1d367d250204e95ea9e709 SHA256 f295745280616cc04724889e2d5b02a9648321e572c256e959989610c0b774e3
 EBUILD ffmpeg-9999.ebuild 8533 RMD160 3cf59444c9a123c4d0fb5547a133a0953869988b SHA1 b360073aa2d074f1de8638ec91657f4bf0d64115 SHA256 0181c080745328fd5fdc02017165edb4de660ac87cf38e17db621cd668e712a2
-MISC ChangeLog 76387 RMD160 b1a17fcbc85201a36ec9cc190793aa30420ddaae SHA1 d965207e031a2d005c7d25972926feb2f3b0063c SHA256 093b59c7ffd63f8dfe127034c59fdc66d7f6740dc85131a6366c53f7a75f5e5a
+MISC ChangeLog 76563 RMD160 d5de0212cf3192c2200a84e4bee0a4372f916562 SHA1 6031bdaf9f63d9232394b2361176cc5086e25b07 SHA256 03d2e30356d20c5f636cd7aa09b6d7037eecac14717c724de81e05f952cc0158
 MISC metadata.xml 3122 RMD160 6263ca0c7ee124af6e229139858a5f5918a1b899 SHA1 25c26812e525fb99a933d55d7713ae43e41ed8bd SHA256 68989560c9de314d276ca99945817a58873b793f48e318ccf67cf2c7f0d7fa54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk99iUAACgkQvFcC4BYPU0pFYgCgumGRGgnkBdX5ugq25c1UteyF
-YX8AoLNsfUHce4XagzHLJ/2IwEHvyYZw
-=YkBu
+iEYEARECAAYFAk+BopQACgkQvFcC4BYPU0pmIgCfRw9yBK0fzx50K36iz3YXpwTf
+wZQAoISTRN7k2EKv/cS2MUiCOGApf9da
+=4b7/
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
index 6de0c50b5b14..24d812e0ba70 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.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-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.3 2012/04/05 11:59:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.4 2012/04/08 14:37:03 aballier Exp $
 
 EAPI="4"
 
@@ -118,6 +118,7 @@ src_prepare() {
 	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
+	epatch "${FILESDIR}/freiordl.patch"
 }
 
 src_configure() {
diff --git a/media-video/ffmpeg/files/freiordl.patch b/media-video/ffmpeg/files/freiordl.patch
new file mode 100644
index 000000000000..1b89ef24dab1
--- /dev/null
+++ b/media-video/ffmpeg/files/freiordl.patch
@@ -0,0 +1,20 @@
+commit cfec77aaf8186f556e1201be13ce487b99b3b831
+Author: Anton Khirnov <anton@khirnov.net>
+Date:   Sun Apr 1 18:56:26 2012 +0200
+
+    configure: add dl to frei0r extralibs.
+
+diff --git a/configure b/configure
+index 4606b23..e207ed8 100755
+--- a/configure
++++ b/configure
+@@ -1526,7 +1526,9 @@ cropdetect_filter_deps="gpl"
+ delogo_filter_deps="gpl"
+ drawtext_filter_deps="libfreetype"
+ frei0r_filter_deps="frei0r dlopen"
++frei0r_filter_extralibs='$ldl'
+ frei0r_src_filter_deps="frei0r dlopen"
++frei0r_src_filter_extralibs='$ldl'
+ hqdn3d_filter_deps="gpl"
+ ocv_filter_deps="libopencv"
+ scale_filter_deps="swscale"