Fixed a52 linking (again). Closes bugs #85929 and #85952.

Package-Manager: portage-2.0.51.19

4 files changed, 14 insertions, 21 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0f02fb5851d6..7c8b9df64ec8 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.57 2005/03/18 23:28:48 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.58 2005/03/20 03:42:06 chriswhite Exp $
+
+  20 Mar 2005; Chris White <chriswhite@gentoo.org>
+  files/gentoo-ffmpeg001.patch, ffmpeg-0.4.9_p20050226-r2.ebuild:
+  Fixed a52 linking (again).  Closes bugs #85929 and #85952.
 
 *ffmpeg-0.4.9_p20050226-r2 (19 Mar 2005)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5261597cef0d..430cb13235d0 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3f09c1d1af5d4082a139fa586e698ad2 ChangeLog 8489
+MD5 1cceb7473f91885853175a133301fd62 ChangeLog 8668
 MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
 MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
 MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
@@ -11,7 +11,7 @@ MD5 6de19a34285effae41c6c96282642338 ffmpeg-0.4.9_p20050226-r1.ebuild 3925
 MD5 d3856e4fa892514cb368877e255f234f ffmpeg-0.4.9_p20050226.ebuild 3270
 MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 d627b290309c7a3a83964890ba3e1621 ffmpeg-0.4.9_p20050226-r2.ebuild 4225
+MD5 8a49ba7ba526e1af2c546a487d38da54 ffmpeg-0.4.9_p20050226-r2.ebuild 4331
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
 MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
@@ -23,13 +23,13 @@ MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
 MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
-MD5 affec1e5021654852b0a7f260c0209b2 files/gentoo-ffmpeg001.patch 1050
+MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
 MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r2 73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCO1xjFdQwWVoAgN4RAiy6AKC12DTXG3waxSSjaZ1jEl1iz3AGNgCgzXYZ
-q4a8u8+XA9aFMdcFa2agljk=
-=xBhK
+iD8DBQFCPOlGFdQwWVoAgN4RAsdNAJ9vs+asFuIUuDqXpHPupBvGE6ZvBwCeJerC
+aPr4JiQQytaqPk5K+NED8No=
+=ukJ7
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild
index 7eb0be16176b..e148f8aff0d8 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.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-r2.ebuild,v 1.1 2005/03/18 23:28:48 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r2.ebuild,v 1.2 2005/03/20 03:42:06 chriswhite Exp $
 
 inherit eutils flag-o-matic gcc multilib
 
@@ -56,6 +56,8 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PN}-libdir-pic.patch
 
+	sed -i -e "s:\$ldl\ \$extralibs:\$ldl\ -la52\ \$extralibs:" configure || die "Unable to patch in -la52"
+
 	cd ${S}
 	cp -R ${S_BASE} ${S_STATIC}
 	mv ${S_BASE} ${S_SHARED}
diff --git a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
index dc654ae04373..30cd0edd31a7 100644
--- a/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
+++ b/media-video/ffmpeg/files/gentoo-ffmpeg001.patch
@@ -1,16 +1,3 @@
---- Makefile.old	2005-02-24 10:18:02.000000000 -0500
-+++ Makefile		2005-03-18 17:48:45.000000000 -0500
-@@ -73,6 +73,10 @@
- EXTRALIBS+=-ldc1394_control -lraw1394
- endif
- 
-+ifeq ($(CONFIG_A52BIN),yes)
-+EXTRALIBS+=-la52
-+endif
-+
- ifeq ($(BUILD_VHOOK),yes)
- VHOOK=videohook
- INSTALLVHOOK=install-vhook
 --- libavcodec/a52dec.c.old	2005-02-28 10:23:54.002233360 +0900
 +++ libavcodec/a52dec.c	2005-02-28 10:35:36.910375080 +0900
 @@ -73,7 +73,7 @@