make the mmx asm work with newer versions of nasm (bug #339150)

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 15 insertions, 7 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 4f91f50d2b48..d3bcfe48a574 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lame
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.122 2010/08/23 20:10:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.123 2010/10/04 15:21:56 mr_bones_ Exp $
+
+  04 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  lame-3.98.2-r1.ebuild, lame-3.98.4.ebuild:
+  make the mmx asm work with newer versions of nasm (bug #339150)
 
   23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> lame-3.98.4.ebuild:
   USE="static-libs", punt .la files, convert to EAPI=\"3\" and add prefix keywords in.
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 67321187c389..929509fa5393 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,7 +5,7 @@ AUX lame-3.98.2-ffmpeg-0.5.patch 2950 RMD160 71628a5b2d9ac7365ccbac3dbf3de7cea60
 AUX lame-3.98.2-get_audio.patch 901 RMD160 caf7367871ae8e9ba7c9e023a06712bdce77fb2b SHA1 385266e642cfe1e9707a1008f29cf0c9055d733c SHA256 9caf9f8fe2c515c8c331598b7e6d595515c597d8f6e81b8626f2bdeb003ed7ff
 DIST lame-3.98.4.tar.gz 1336008 RMD160 0c554f587ea736f33b44d40e4ab06e1160a04050 SHA1 89a46e47380710c68f598c762301ab31b989fa5c SHA256 f2a3904a0ddc0356b4150be98c007374e8cf9784325336c0e29c8375b220a438
 DIST lame-398-2.tar.gz 1327643 RMD160 767dd94271eef221170469535db2bf388149715a SHA1 b2db41dbc9c0824caa102e8c932b820c79ccd5ec SHA256 a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
-EBUILD lame-3.98.2-r1.ebuild 2577 RMD160 8a2e5c2d01d1f6916b6a39301e5a69170cc93f3d SHA1 741e3c47ea5610e038e95aa174701e953a88839e SHA256 9750f8ded01d98eb8858b9ddc5dbaebe11d81961673deab6ea9e0648c2ebb85e
-EBUILD lame-3.98.4.ebuild 1707 RMD160 6ada27d1971dec5057b346f3687eccc1929841af SHA1 d0b6ba495eebd7f4eba319ca33e7f0c2db713872 SHA256 65a8224bbc09422daabdd028e24e82ba4dc125a57507658a6bb080fca1ba9a74
-MISC ChangeLog 16705 RMD160 640d5e49edf661493c86bfe758864b72d0361c3d SHA1 5f412035e2f7ae2c22d53d183135bdab8d6f23d2 SHA256 a20eb5bd5b657bc30bfd39dab6b02fcdb20898f8dde9cde5a6dc4ac8da60ac53
+EBUILD lame-3.98.2-r1.ebuild 2644 RMD160 9f1d715a7015e91a0ea9f524998db57082cc7e3e SHA1 1c6f233e20a9602ef20ad0d45b838743bece0d07 SHA256 1d7376f84d836835314cc3a4a2ba71a27882d2650f8dfe111e8efc6328cf4d50
+EBUILD lame-3.98.4.ebuild 1772 RMD160 3a3a503c8e140947bcbbfab7c612295d5ec8351e SHA1 585b75e3225777df936c391207267ad4ca910f47 SHA256 aa402b4b148f2c04ddea737e92f458ca291b5c7462d3a879659a65a540297ae3
+MISC ChangeLog 16872 RMD160 d292bdda0da88d98af336b8d120f82200e3a4e1d SHA1 aed09a7d36d52413f82535bba38f62d9b24cf5a4 SHA256 2658fa6c1a1051e7f7c74604172f6e6e4b150ff188472a613daa08b19bf9f6c8
 MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280
diff --git a/media-sound/lame/lame-3.98.2-r1.ebuild b/media-sound/lame/lame-3.98.2-r1.ebuild
index 49d7aad4e39f..75d726268bfc 100644
--- a/media-sound/lame/lame-3.98.2-r1.ebuild
+++ b/media-sound/lame/lame-3.98.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.2-r1.ebuild,v 1.8 2009/06/25 17:30:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.2-r1.ebuild,v 1.9 2010/10/04 15:21:56 mr_bones_ Exp $
 
 inherit flag-o-matic toolchain-funcs eutils autotools versionator
 
@@ -45,6 +45,8 @@ src_unpack() {
 	# It fails parallel make otherwise when enabling nasm...
 	mkdir "${S}/libmp3lame/i386/.libs" || die
 
+	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx # embedded bug #74498
 }
diff --git a/media-sound/lame/lame-3.98.4.ebuild b/media-sound/lame/lame-3.98.4.ebuild
index 5f35bfb8d19b..c6a412e27aa3 100644
--- a/media-sound/lame/lame-3.98.4.ebuild
+++ b/media-sound/lame/lame-3.98.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.4.ebuild,v 1.4 2010/08/23 20:10:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.4.ebuild,v 1.5 2010/10/04 15:21:56 mr_bones_ Exp $
 
 EAPI=3
 inherit autotools eutils
@@ -29,6 +29,8 @@ src_prepare() {
 
 	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
 
+	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx #74498
 }