Add mmx useflag wrt bug #93279 and fix build of mmx asm with libtool 2.2

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 40 insertions, 6 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 0ec5f39cfb39..41bd246e185e 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lame
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.100 2008/07/16 21:22:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.101 2008/08/08 08:29:25 aballier Exp $
+
+  08 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/lame-3.98-echo.patch, lame-3.98.ebuild:
+  Add mmx useflag wrt bug #93279 and fix build of mmx asm with libtool 2.2
 
   16 Jul 2008; Alexis Ballier <aballier@gentoo.org>
   files/lame-3.96.1-shared-frontend.patch:
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 7036444e6974..fcda7e7be720 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lame-3.96-ccc.patch 658 RMD160 c598ad66543cc63897e0212e220a436da563ee71 SHA1 1e291ea8dbde132a22760a5279abe624e2835fae SHA256 60f0a60a72711827222cbb2d934a285199a62f9899e84097f851a53c61c4e6dd
 AUX lame-3.96.1-asneeded.patch 9027 RMD160 5456182576a331feb00d1d8931ba598e37f08804 SHA1 16ca5409f6710e3bf061f1fc3e339a0b265ac8a8 SHA256 6f9874c2f79c129a6d0d8d59d5887e8dbceff4a4bad2ad0b35987dc7d3f09809
 AUX lame-3.96.1-shared-frontend.patch 483 RMD160 bbcd78d61c25a92cdbcc04f10cf11f1a455846a2 SHA1 f2c7442d84e3d437e3c5d76064cf3e960ea6fad7 SHA256 b4b62098d61bc4e252b03abaea2f92d812ba0a8b16bb5fdf45d4b926e6c8c417
+AUX lame-3.98-echo.patch 361 RMD160 bc51688461367c85fcffa76b52d39f814037ceda SHA1 f7736b32ab06f9f0e9bda8e59b6d98779b8bfdf3 SHA256 1917632a5fb5c55a85582c3e3dc23681bb91eefc700aad29e17d5d5e9f2f5eec
 AUX lame-3.98-execstacks.patch 471 RMD160 047433da9998efc8110d592d7e1ed0862599302d SHA1 a8d44c4bddb1f6ad1b5a9dda5ed8a6f37c0335df SHA256 13cba5c2bcdcb58da1ff7b3d68e0422bc05f234da0896e3cd755a0ea003b9520
 AUX lame-3.98-gtk-path.patch 8606 RMD160 8bca3b986edf75853bfaee6837f9eb4832b664fa SHA1 dc77fbe83f167eeb3f77b6677a90765395b17de9 SHA256 0728822c0eb05b6dc70c0ae8e064c9be3b2a3448d10a53764397c70b7489a3b8
 AUX lame-3.98-pic-fix.patch 14804 RMD160 443e4b1fc6a54be4d2c356ea7b4cc857f26b2a1c SHA1 551d364c34c30f6486b034f6e0789247450aae95 SHA256 f77ededd6e067a4d47ad49a0fa939290de5b248ef83a4b8a1aba52dbb0649381
@@ -9,6 +13,13 @@ AUX lame-3.98-stdint.patch 651 RMD160 84a732f356ac05941d90c2a261f9d624fc38bc5b S
 DIST lame-3.97.tar.gz 1328058 RMD160 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 SHA1 acf56065f4e31ce023b0f99002d537adb1ec09df SHA256 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
 DIST lame-398.tar.gz 1415983 RMD160 754343791ac80d2403291c63f99eb409bca6b62f SHA1 287979d076834882c99d0cc01ddbd9b3697ceaae SHA256 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1
 EBUILD lame-3.97-r1.ebuild 2344 RMD160 0a9a1f527ff190af4be8537e005f228c7bca6de2 SHA1 7b8e6829846de017788b86605bedcc46590261f5 SHA256 0562fbf1fe90d783f9f04eff7b5adfabd5b0bf1865f28826852b48086f114604
-EBUILD lame-3.98.ebuild 2720 RMD160 a11cdd5b19cb210e4e58dac3827e0d175e9ea012 SHA1 f97cd7edfa309b9ee86625d47b20883d792f3b66 SHA256 b6f0b47319a4101b560237815526a5416ba75820a43154a89fc8a826f713ab02
-MISC ChangeLog 13970 RMD160 9c8c7768843f636c697ec9744f6e81653712cf90 SHA1 fc89363493e5836d32f790997266a8f4d4f9cc10 SHA256 5445977fc7c450287657c1cc0dac40dbe3c9d054311dd3e09a54a276d91bc22e
+EBUILD lame-3.98.ebuild 2902 RMD160 96fcb761eee2c8eb7fa949322b07ec00df8a94c6 SHA1 3c381588959be200767347551612f7fdd03565fa SHA256 0d216b33806d272c7da57298978e75772b41633467a0a8cfda745382d83128b2
+MISC ChangeLog 14147 RMD160 4a18f9a688198d95b92996b706ea3a00463eba29 SHA1 2b2f1b070cacd07532067f7251320a2321238290 SHA256 c89c10afb2bf4c7c7a61c416270b5f3b0ea70dbb1e03ffcee209d542d4af1831
 MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkicA+sACgkQvFcC4BYPU0p7tgCfScYZ2PinZPD3T/Rfbcc6WEL/
+EEQAn1veeDm16TTdpemY1SkiPIeN3n7n
+=uqHa
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lame/files/lame-3.98-echo.patch b/media-sound/lame/files/lame-3.98-echo.patch
new file mode 100644
index 000000000000..6d3edbaee31a
--- /dev/null
+++ b/media-sound/lame/files/lame-3.98-echo.patch
@@ -0,0 +1,13 @@
+Index: lame-398/libmp3lame/i386/Makefile.am
+===================================================================
+--- lame-398.orig/libmp3lame/i386/Makefile.am
++++ lame-398/libmp3lame/i386/Makefile.am
+@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign $(top_srcdir)
+ 
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
++ECHO ?= echo
++
+ nasm_sources = \
+ 	choose_table.nas \
+ 	cpu_feat.nas \
diff --git a/media-sound/lame/lame-3.98.ebuild b/media-sound/lame/lame-3.98.ebuild
index d9f4cf40cd9c..d0b7ae574a87 100644
--- a/media-sound/lame/lame-3.98.ebuild
+++ b/media-sound/lame/lame-3.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.ebuild,v 1.5 2008/07/16 21:03:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.ebuild,v 1.6 2008/08/08 08:29:25 aballier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils autotools versionator
 
@@ -14,12 +14,13 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug mp3rtp sndfile"
+IUSE="debug mmx mp3rtp sndfile"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )"
 
 src_unpack() {
 	unpack ${A}
@@ -47,6 +48,10 @@ src_unpack() {
 	# Let it use proper %if statements for marking stacks as non executable
 	epatch "${FILESDIR}"/${PN}-3.98-execstacks.patch
 
+	# It needs $(ECHO) to be defined but it seems libtool 2.2 doesn't define it
+	# anymore
+	epatch "${FILESDIR}/${P}-echo.patch"
+
 	# It fails parallel make otherwise when enabling nasm...
 	mkdir "${S}/libmp3lame/i386/.libs" || die
 
@@ -65,6 +70,7 @@ src_compile() {
 		--enable-shared \
 		$(use_enable debug debug norm) \
 		--disable-mp3x \
+		$(use_enable mmx nasm) \
 		$(use_enable mp3rtp) \
 		${myconf} || die "econf failed"