summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-01-20 20:32:49 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-01-20 20:32:49 +0000
commit83b800a94c0f62739b8ac39a357333155bb1751e (patch)
tree096eda63dc49f895da35d315a525498ae33daf86 /media-sound/lame
parentUnmask USE="jack" for media-plugins/audacious-plugins wrt #389439 by Bob Johnson (diff)
downloadhistorical-83b800a94c0f62739b8ac39a357333155bb1751e.tar.gz
historical-83b800a94c0f62739b8ac39a357333155bb1751e.tar.bz2
historical-83b800a94c0f62739b8ac39a357333155bb1751e.zip
workaround broken --disable-nasm flag
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'media-sound/lame')
-rw-r--r--media-sound/lame/ChangeLog6
-rw-r--r--media-sound/lame/Manifest16
-rw-r--r--media-sound/lame/lame-3.99.3.ebuild6
3 files changed, 19 insertions, 9 deletions
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 3a4f6e1396cb..bf2c238de101 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/lame
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.141 2012/01/18 21:28:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.142 2012/01/20 20:32:49 ssuominen Exp $
+
+ 20 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> lame-3.99.3.ebuild:
+ Stop using $(use_enable) for "mmx" because --disable-nasm is broken wrt
+ #361879 by "citiesom" and "Dillon"
18 Jan 2012; Markus Meier <maekke@gentoo.org> lame-3.99.3.ebuild:
arm stable, bug #398353
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 7590ab211ea6..4c481191e021 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -8,13 +8,17 @@ AUX lame-3.98.2-get_audio.patch 901 RMD160 caf7367871ae8e9ba7c9e023a06712bdce77f
DIST lame-3.98.4-r1.tar.gz 1336025 RMD160 4eb2ae6f2ec7b30115c1265bcbf6f14906502e9b SHA1 eb29c7c937b9b7330ca979dfabc25ab2a31b9db2 SHA256 ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8
DIST lame-3.99.3.tar.gz 1443843 RMD160 4f5f824fbc88d78904d90b396e8a450626738d18 SHA1 0d9acaed7737d5e6b51096dc0b35322d319f463d SHA256 d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf
EBUILD lame-3.98.4.ebuild 1816 RMD160 fbc4564ad4789bfbf144a1334124656cc6d4d33a SHA1 c0a3367eb175e0369f0fecccdce2e40df8ced0c5 SHA256 e5a184a2eed213a1b41c184d1550661a83a933ceae242c9e5e11af90546f799f
-EBUILD lame-3.99.3.ebuild 1633 RMD160 994c2431a63539a9d2945601dc31541528f40f12 SHA1 22adb06d6d14a35458c7a95ae86fceb6c9df73a6 SHA256 6b2af9d74df46ef2968bb92f40fbf10eb5ad03a9d10a4938b33bdc7563d93f21
-MISC ChangeLog 18828 RMD160 bc540346f1d53a7fe17620ca783a57e9465d2188 SHA1 6392616aa78f8c4772462e9fbda3a1f01a610a53 SHA256 57bf0ae55824228d7e1f3f09ac5c9ccaf6997084bc962a4f6e7b16340144be94
+EBUILD lame-3.99.3.ebuild 1729 RMD160 07c925f18548798d95aaaaa81490aefaed7cdf19 SHA1 853a68eccf903f86b5c3bc395a3a156f476acc8d SHA256 fbe20aba0f89cb24158cd112b6f3ba9f10ce1803ddc84385c50744b18fe7a44f
+MISC ChangeLog 19017 RMD160 24c9709309ce4c09e71c03ac9eb02f0899664a1d SHA1 59a378dd6a8ae8f15fc1a1a9882680ea98da2953 SHA256 c7147f07e3a1d08192755e5c9e16e6776e94eb12d7d4f5dad5cdb6b386e23aee
MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk8XOgQACgkQkKaRLQcq0GIgUQCeLvJrEjBAfbX+V3ijaHhIFO7C
-QoQAn0DKFtaWLjIDhwR1elE3y8Ulx/7N
-=EyZ7
+iQEcBAEBAgAGBQJPGc7zAAoJEEdUh39IaPFN89gIAJcsLOOB5HF5WtwzMiTVXYRu
+NJUUt13ZjH+92yen3Hc/gnh8rY0WHPCCUAi/HXaAbgKCLVrXusbn4Dj+ivCNV16G
+WeYKIwPt0Sg/xB+nAFA3ADBuqFSxujem3h+a7Thw4+ocGkUxcQ77ZUm+3wVZJmkr
+dkhkdYeWTsV8fr3zGvffHnyeAaFson8LXxVz6940Fb6Zc5SjODc/ou19NKcVj2Bn
+IvWmrtuHHDKeIZD68Y1R7uPKNrK2Cm4EgzdsNfHLN9BEmQ7zCG1pivgLLG/pn9H0
+fz9Kp9ApWjTZcwZpn+ZeWBbIUaw8T8kSalv+FL8rt4oY5GFSlHKrOrQMYXP98Rw=
+=i74U
-----END PGP SIGNATURE-----
diff --git a/media-sound/lame/lame-3.99.3.ebuild b/media-sound/lame/lame-3.99.3.ebuild
index a27572f79ac9..7249730f1324 100644
--- a/media-sound/lame/lame-3.99.3.ebuild
+++ b/media-sound/lame/lame-3.99.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.3.ebuild,v 1.4 2012/01/18 21:28:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.3.ebuild,v 1.5 2012/01/20 20:32:49 ssuominen Exp $
EAPI=4
inherit autotools eutils
@@ -29,18 +29,20 @@ src_prepare() {
sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+ use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+
AT_M4DIR=${S} eautoreconf
epunt_cxx #74498
}
src_configure() {
local myconf
+ use mmx && myconf="--enable-nasm" #361879
use sndfile && myconf="--with-fileio=sndfile"
econf \
$(use_enable static-libs static) \
$(use_enable debug debug norm) \
- $(use_enable mmx nasm) \
--disable-mp3x \
$(use_enable mp3rtp) \
--enable-dynamic-frontends \