Use --cc option instead of overwriting CC variable to respect the compiler, pass --extra-ldflags to respect LDFLAGS (only 20060302 respect them entirely). Add patch to allow using --as-needed flag.

Package-Manager: portage-2.1_pre6-r5

5 files changed, 55 insertions, 21 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 318ef1bff6ff..dc54474974a4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.131 2006/03/08 23:55:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.132 2006/03/21 15:10:10 flameeyes Exp $
+
+  21 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch,
+  ffmpeg-0.4.9_p20051216.ebuild, ffmpeg-0.4.9_p20060302.ebuild:
+  Use --cc option instead of overwriting CC variable to respect the compiler,
+  pass --extra-ldflags to respect LDFLAGS (only 20060302 respect them
+  entirely). Add patch to allow using --as-needed flag.
 
   08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   ffmpeg-0.4.9_p20051216.ebuild, ffmpeg-0.4.9_p20060302.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 04720258442e..da1a555a19f8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 03684bfb7e8b1602d3adb2eb1ec5e0b6 ChangeLog 19527
-RMD160 6568c56f5adbbd80d7f6d8245fe3668d8856375a ChangeLog 19527
-SHA256 40c9eb72ef5d7a7c100e924d6759cca1468ecac5a49fc36c95bcba908b597297 ChangeLog 19527
+MD5 c0b7a14359520f253a1d9a2c7514edd8 ChangeLog 19907
+RMD160 0b5f134e358093e7c1b7aab124737b3948c00477 ChangeLog 19907
+SHA256 04d8550fa8c995cc853884db835b55b62fe52c368730b272af02b398bc467a90 ChangeLog 19907
 MD5 da4fb7c75a6d011f4d7e0d337d449129 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 RMD160 bb6e81aff569ad13e7bf13aa09f76602e4f2a590 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
 SHA256 5135d135bcdd29a9e5f4dcd2e1d4b75bc851a465de513531537af6bf4684a7a5 ffmpeg-0.4.9_p20050226-r3.ebuild 4388
@@ -16,12 +16,12 @@ SHA256 2892dbbab75019068039d6e90916687d408f99e430828eefc76c98d944bd6095 ffmpeg-0
 MD5 faab330a828982afbde572059cedc47f ffmpeg-0.4.9_p20051120.ebuild 4707
 RMD160 780c136f2421f22a874dbb389b9d0770922229e6 ffmpeg-0.4.9_p20051120.ebuild 4707
 SHA256 c0407f86a50fd884266d46a607e16d7917d65f0a87c9e7baee4718dc401b14a2 ffmpeg-0.4.9_p20051120.ebuild 4707
-MD5 75cde2182f8de9b467e48bf6ace60fa4 ffmpeg-0.4.9_p20051216.ebuild 5679
-RMD160 877520e6e14368a0c41b32cb2fdb2f5f24ab3eb1 ffmpeg-0.4.9_p20051216.ebuild 5679
-SHA256 33014bc0cbc2d2fd3381f3c88a8f36bd19e1576ddd931fb317b21bfa796fef01 ffmpeg-0.4.9_p20051216.ebuild 5679
-MD5 eb23111005fd4ffe88f2d29cb494a1ba ffmpeg-0.4.9_p20060302.ebuild 7105
-RMD160 8330fa7595f59ae17c659f36091426f027c50613 ffmpeg-0.4.9_p20060302.ebuild 7105
-SHA256 91bf37fbf0fd90d9a739548dec92fc2a1a7f0182b4a047b7fe3867c3dc7bb90f ffmpeg-0.4.9_p20060302.ebuild 7105
+MD5 77bf2e5e661831311253e8558432768f ffmpeg-0.4.9_p20051216.ebuild 5792
+RMD160 a9c7ea9d50e9d86a76bc8024e808884db7ebf71f ffmpeg-0.4.9_p20051216.ebuild 5792
+SHA256 ac025d3a396f68a30490eb333c1c061bf4a6a315bb66e67011f5c1b71e809da6 ffmpeg-0.4.9_p20051216.ebuild 5792
+MD5 f0bef671b4a1aa7e464bb16fd7be7b7f ffmpeg-0.4.9_p20060302.ebuild 7252
+RMD160 8ab0b303e6fbae97f43ad2dcae804dce127f9773 ffmpeg-0.4.9_p20060302.ebuild 7252
+SHA256 f615e1cfd6f8db5eb6add207531d91015362d3dfdad08c0bfcb477ea6dfb5a8e ffmpeg-0.4.9_p20060302.ebuild 7252
 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994
 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 files/0.4.8-gcc3.4-magicF2W.patch 994
@@ -49,6 +49,9 @@ SHA256 ee18f6a837fd5724f08720b9785f0603f85db97b22120f33586b8a9811c5efef files/ff
 MD5 7ff9e08e701f8a8a860c09bd9259843f files/ffmpeg-0.4.9_p20050906-osx.patch 11103
 RMD160 b479f18da37fdb088abc85e63ef998186cb45bf8 files/ffmpeg-0.4.9_p20050906-osx.patch 11103
 SHA256 e687fd7008c401c54e31552b15b56a5590b85d7ac8b2c39b906acca82a09b5c8 files/ffmpeg-0.4.9_p20050906-osx.patch 11103
+MD5 033883c60f131664912970ffb6042612 files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
+RMD160 b59933fab102460b62b092799c27a7811748f76a files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
+SHA256 b7c7fbbe39e8ceabccabc1935cb4fa91b7287bc72eca323b21b25f0e9e08f13f files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch 559
 MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
 RMD160 193d2d855f2c613531f1b880a194c5be55ccab5c files/ffmpeg-a52.patch 1111
 SHA256 350bdb742f2cf65ca1fcde2b3252887962c951071fa41e6550f207e4534b4071 files/ffmpeg-a52.patch 1111
@@ -85,7 +88,7 @@ SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFED28AAiZjviIA2XgRAqdkAJ9Zh9hLE9/Am8gIsiVZaxBZUZ7s5gCfa/45
-CkFN0GOgVxZdGqoJ8BQw/R4=
-=/SIS
+iD8DBQFEIBbyAiZjviIA2XgRAhcSAKCkE6FlWar1O1ORp3oiX6inyysnNQCg5Mns
++/ZmoZF7mIKGL+pFDO5QYlM=
+=N21v
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild
index 525d7ef2694b..5f1e65250438 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_p20051216.ebuild,v 1.20 2006/03/08 23:55:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20051216.ebuild,v 1.21 2006/03/21 15:10:10 flameeyes Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -51,6 +51,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
 	epatch ${FILESDIR}/ffmpeg-soname-symlink.patch
+	epatch "${FILESDIR}/${P}-asneeded-configure.patch"
 
 	# ffmpeg doesn'g use libtool, so the condition for PIC code
 	# is __PIC__, not PIC.
@@ -111,14 +112,17 @@ src_compile() {
 		$(use_enable zlib) \
 		$(use_enable sdl ffplay) \
 		$(use_enable aac faad) $(use_enable aac faac) --disable-faadbin \
+		--cc=$(tc-getCC) \
 		--enable-gpl \
 		--enable-pp \
 		--disable-opts \
 		--disable-strip"
 
 	cd ${S_STATIC}
-	econf --disable-shared-pp --disable-shared --enable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "static failed"
+	econf --disable-shared-pp --disable-shared --enable-static \
+		"--extra-ldflags=${LDFLAGS}" \
+		${myconf} || die "Configure failed"
+	emake || die "static failed"
 
 	# Specific workarounds for too-few-registers arch...
 	if [[ $(tc-arch) == "x86" ]]; then
@@ -133,8 +137,10 @@ src_compile() {
 	fi
 
 	cd ${S_SHARED}
-	econf --enable-shared-pp --enable-shared --disable-static ${myconf} || die "Configure failed"
-	emake CC="$(tc-getCC)" || die "shared failed"
+	econf --enable-shared-pp --enable-shared --disable-static \
+		"--extra-ldflags=${LDFLAGS}" \
+		${myconf} || die "Configure failed"
+	emake || die "shared failed"
 }
 
 src_install() {
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
index 77deb18f21c1..9821a0ad9387 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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_p20060302.ebuild,v 1.8 2006/03/08 23:55:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.9 2006/03/21 15:10:10 flameeyes Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -72,6 +72,7 @@ src_unpack() {
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
 
 	epatch ${FILESDIR}/ffmpeg-unknown-options.patch
+	epatch "${FILESDIR}/${PN}-0.4.9_p20051216-asneeded-configure.patch"
 
 	# ffmpeg doesn'g use libtool, so the condition for PIC code
 	# is __PIC__, not PIC.
@@ -144,10 +145,12 @@ src_compile() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--enable-static --disable-shared \
+		"--cc=$(tc-getCC)" \
+		"--extra-ldflags=${LDFLAGS}" \
 		${myconf} || die "static failed"
 
 
-	emake CC="$(tc-getCC)" || die "static failed"
+	emake || die "static failed"
 
 	# Specific workarounds for too-few-registers arch...
 	if [[ $(tc-arch) == "x86" ]]; then
@@ -170,9 +173,11 @@ src_compile() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--disable-static --enable-shared \
+		"--cc=$(tc-getCC)" \
+		"--extra-ldflags=${LDFLAGS}" \
 		${myconf} || die "shared failed"
 
-	emake CC="$(tc-getCC)" || die "shared failed"
+	emake || die "shared failed"
 }
 
 src_install() {
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch
new file mode 100644
index 000000000000..ba733bc4f17d
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20051216-asneeded-configure.patch
@@ -0,0 +1,13 @@
+Index: ffmpeg-0.4.9-p20051216/configure
+===================================================================
+--- ffmpeg-0.4.9-p20051216.orig/configure
++++ ffmpeg-0.4.9-p20051216/configure
+@@ -987,7 +987,7 @@ int main( void ) { return (lrintf(3.999f
+ EOF
+ 
+ have_lrintf="no"
+-if $cc $CFLAGS $LDFLAGS $extralibs -o $TMPE $TMPC 2> /dev/null ; then
++if $cc $CFLAGS $LDFLAGS -o $TMPE $TMPC $extralibs 2> /dev/null ; then
+   have_lrintf="yes"
+   # allanc@chickenandporn.com: cannot execute cross-compiled
+   # code on the host.  Only execute if not cross-compiling.