Added patch to fix linking to libdc1394 package. Fixes bug #90150.

Package-Manager: portage-2.0.51.20

4 files changed, 48 insertions, 23 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c30562331465..194c487ef82d 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.69 2005/04/24 18:02:25 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.70 2005/04/24 19:00:21 flameeyes Exp $
+
+  24 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ffmpeg-configure-extralibs.patch, ffmpeg-0.4.9_p20050226-r4.ebuild:
+  Added patch to link to libdc1394 when ieee1394 is enabled. Fixes #90150.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   ffmpeg-0.4.9_p20050226-r3.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index db3b55c8c390..71d73895fbf2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,29 +1,30 @@
-MD5 f9ad96b4c9f4d1983c5d0090cb564721 ffmpeg-0.4.9_p20050226-r2.ebuild 4382
-MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
-MD5 99135a0902ee370985847f3a4fbcfa20 ffmpeg-0.4.9_p20050226-r3.ebuild 4380
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 e73635334c0240dabdd690f31e3c5b15 ChangeLog 10452
 MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
-MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
-MD5 e82dd63f43146a8343cbd243ae279200 ChangeLog 10243
-MD5 556d5a8e7d0e3475c6eb42280a6d92d0 ffmpeg-0.4.9_p20050226.ebuild 3271
 MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
-MD5 d82fb944edee3a6e416f3f64488335b1 ffmpeg-0.4.9_p20050226-r4.ebuild 4663
+MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
+MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
+MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
 MD5 0e7ff4e46ede79a2e47d6285e501041a ffmpeg-0.4.9_p20050226-r1.ebuild 3926
+MD5 f9ad96b4c9f4d1983c5d0090cb564721 ffmpeg-0.4.9_p20050226-r2.ebuild 4382
+MD5 556d5a8e7d0e3475c6eb42280a6d92d0 ffmpeg-0.4.9_p20050226.ebuild 3271
 MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
-MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 99135a0902ee370985847f3a4fbcfa20 ffmpeg-0.4.9_p20050226-r3.ebuild 4380
+MD5 c3f334d4659c8efc72b72085fdc52592 ffmpeg-0.4.9_p20050226-r4.ebuild 4609
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
+MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
-MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
+MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
 MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
-MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
+MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r2 73
+MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
+MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
-MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
-MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
+MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
+MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r4 73
-MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
-MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
-MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
+MD5 36d1f36a3d310ddd32bd782f10e1bdb7 files/ffmpeg-configure-extralibs.patch 724
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild
index c1a7aca0015d..f2459f282921 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild,v 1.2 2005/04/22 13:12:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r4.ebuild,v 1.3 2005/04/24 19:00:21 flameeyes Exp $
 
 inherit eutils flag-o-matic gcc multilib toolchain-funcs
 
@@ -64,8 +64,7 @@ src_unpack() {
 		|| die "sed failed (HAVE_MMX)"
 
 	epatch ${FILESDIR}/${PN}-libdir-pic.patch
-
-	sed -i -e "s:\$ldl\ \$extralibs:\$ldl\ -la52\ \$extralibs:" configure || die "Unable to patch in -la52"
+	epatch ${FILESDIR}/${PN}-configure-extralibs.patch
 
 	cd ${S}
 	cp -R ${S_BASE} ${S_STATIC}
diff --git a/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch b/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch
new file mode 100644
index 000000000000..a61ba0f75505
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-configure-extralibs.patch
@@ -0,0 +1,21 @@
+diff -ur ffmpeg-0.4.9-p20050226/configure ffmpeg-0.4.9-p20050226-configure/configure
+--- ffmpeg-0.4.9-p20050226/configure	2005-02-24 16:18:02.000000000 +0100
++++ ffmpeg-0.4.9-p20050226-configure/configure	2005-04-24 18:13:19.206706664 +0200
+@@ -404,7 +404,7 @@
+   ;;
+   --enable-a52) a52="yes"
+   ;;
+-  --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs"
++  --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs -la52"
+   ;;
+   --enable-dts) dts="yes" ; extralibs="$extralibs -ldts"
+   ;;
+@@ -428,7 +428,7 @@
+   ;;
+   --enable-xvid) xvid="yes"
+   ;;
+-  --enable-dc1394) dc1394="yes"
++  --enable-dc1394) dc1394="yes" ; extralibs="$extralibs -ldc1394_control -lraw1394"
+   ;;
+   --disable-vhook) vhook="no"
+   ;;