Fix building with USE="-mad" wrt #317595 by Sergiy Borodych.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 37 insertions, 21 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 908abfd661b6..2b40d7f72966 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.118 2010/04/23 12:18:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.119 2010/04/29 11:46:59 ssuominen Exp $
+
+  29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> sox-14.3.1.ebuild,
+  +files/sox-14.3.1-nomad.patch:
+  Fix building with USE="-mad" wrt #317595 by Sergiy Borodych.
 
 *sox-14.3.1 (23 Apr 2010)
 
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 493ee0fd46f3..f0799154fb9e 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sox-14.2.0-distro.patch 1245 RMD160 a0ea4f0ab40113d8ffd4f6e5be7b1f2189c6aa76 SHA1 4aba29093e30720e785bac8e51e2a661ad2d9716 SHA256 6bee373206b67fe9040ca34e98d08b32ac45330ec48f68ac665398baab97a9f6
 AUX sox-14.2.0-file-5.0.patch 580 RMD160 8a6c0de5d55b3986bb343de02e96f4f155eee91c SHA1 6eded5629a863e88e9b96a08eff3e24224ae2413 SHA256 5fa17a034348bd9b5301b7df9c4b8b6603902404103a9d145d5e7084a39bd622
+AUX sox-14.3.1-nomad.patch 401 RMD160 ebd569e1fe54521cce9acf22f5c10a039deae27b SHA1 8eda98ea9ff97cca42007d6964d8139f111bf70f SHA256 d8a8ffd166becd9acf39b1b55dc49f1dabeebdcc3965cfb5e6985f4b571dc033
 DIST sox-14.2.0.tar.gz 964800 RMD160 7c76a2db5c5838fc3d9f8b5402e47d548fd094d5 SHA1 1b60e5af43f44a51247fb978f2423f0de7e27363 SHA256 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3d86a0e84f6939e61a9dc1
 DIST sox-14.3.0.tar.gz 1007679 RMD160 9302e00d76c972c4916979d147468f640e04acaa SHA1 34b8e991ba8511fa9683e9e9d356fb7f4179d03c SHA256 9abf411c949366d75c884b368284690b6c8c7d5fb5df0deaf599539b704b2397
 DIST sox-14.3.1.tar.gz 1044595 RMD160 d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7 SHA1 ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384 SHA256 c4be9ebdb1e77a3bc9f3ee1f3fd274a1fe7b162a174fcc74874b231f3f1ace54
 EBUILD sox-14.2.0-r1.ebuild 2015 RMD160 361584fa9d897e7489644329d11919a2f520378d SHA1 653f013e44716c26c24d09686add8dc1a228122c SHA256 883d83e81999b05fd91c44ff3bbe59bf2d00ee0e97c15e74458714945e122b8c
 EBUILD sox-14.2.0.ebuild 1949 RMD160 8a8cac1f38a41976b9fdd218808f5c5ecd9a2bd8 SHA1 af0359ed2a50c3539c2636ae6ddd676b873d9dda SHA256 e39e20697474f2e1098be7640c3bcf7894bd25d1b9e0cea771d3fea5c1dddad2
 EBUILD sox-14.3.0.ebuild 1806 RMD160 77f82d7b67911d127bc12fd1a31e594cec95e32e SHA1 47010c97bc9e4f4f444577c8b0e5d42a6f1117a0 SHA256 ac59a247debff2e959c1615240b2129632aa8454e378881c78e14436c1fae1e1
-EBUILD sox-14.3.1.ebuild 1865 RMD160 a21118a35e7d60f5d283e898fea5d6e7976a0781 SHA1 e2071f31dda2b285350f87f1295c2c4bdd15eda9 SHA256 6eada69caed741644c06d2d76c29a8ba2cd67d5e2c03dcb853a362166297e234
-MISC ChangeLog 15529 RMD160 7f3337ffcc81eae3611b9565452721ca049c9351 SHA1 f5a2a093292b0dd3c5fd67c84740e9b9f925c82d SHA256 dc185d2ae90ce9fa9261cf14fb20a35ab01eba9380c7b20c7320b81fdd5307ce
+EBUILD sox-14.3.1.ebuild 1938 RMD160 a314dbae801dd21bfea4bdf83599baf89179f9de SHA1 1efb76465ff24782b9ede46be786477cc8a27329 SHA256 9a5a6978d167f5a800e830cef35089e6b6f2c2a92c11ace495b0c41176f907dc
+MISC ChangeLog 15700 RMD160 dc12269324282c2fe03b15afd2fdec69c7743210 SHA1 d6ae1aae53ef1d98d79d6e5aebf926a7fff101cd SHA256 57d7265de6e043d9f374a83efdeec2dc75f5642c4807a52e5e64cd485ddbcc1d
 MISC metadata.xml 318 RMD160 9ed7f56a243d795af858a8269ef4aa6c0b12de10 SHA1 77351e7231619c84672be1f9407a91268c728043 SHA256 cbacb312c7d857414aacc7c5c44d7f0c6c617cc8475feb8371c7174ee5b04f5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvRkA4ACgkQvFcC4BYPU0oiewCgplCpprwKRRjaRBzH5s6AU4BS
-gxwAoKxA5BSZttzU2m3qTIeLjsImW1Us
-=Kzwo
------END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/sox-14.3.1-nomad.patch b/media-sound/sox/files/sox-14.3.1-nomad.patch
new file mode 100644
index 000000000000..7bcad4f4390d
--- /dev/null
+++ b/media-sound/sox/files/sox-14.3.1-nomad.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/317595
+
+--- src/mp3.c
++++ src/mp3.c
+@@ -56,8 +56,10 @@
+  * Sidestep the issue by defining our own mad_timer_zero. This is needed because
+  * mad_timer_zero is used in some of the mad.h macros.
+  */
++#ifdef HAVE_MAD_H
+ #define mad_timer_zero mad_timer_zero_stub
+ static mad_timer_t const mad_timer_zero_stub = {0, 0};
++#endif
+ 
+ #define MAXFRAMESIZE 2880
+ #define ID3PADDING 128
diff --git a/media-sound/sox/sox-14.3.1.ebuild b/media-sound/sox/sox-14.3.1.ebuild
index f64fb6c46918..a9bd8b6e26b8 100644
--- a/media-sound/sox/sox-14.3.1.ebuild
+++ b/media-sound/sox/sox-14.3.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.1 2010/04/23 12:18:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.2 2010/04/29 11:46:59 ssuominen Exp $
 
-inherit flag-o-matic
+EAPI=2
+inherit eutils flag-o-matic
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
@@ -13,7 +14,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg oss png pulseaudio sndfile wavpack"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
+# libtool required for libltdl
+RDEPEND="sys-devel/libtool
+	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	encode? ( media-sound/lame )
 	flac? ( media-libs/flac )
@@ -31,11 +34,16 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile () {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nomad.patch
+}
+
+src_configure() {
 	# Fixes wav segfaults. See Bug #35745.
 	append-flags -fsigned-char
 
-	econf $(use_with alsa) \
+	econf \
+		$(use_with alsa) \
 		$(use_enable debug) \
 		$(use_with ao) \
 		$(use_with oss) \
@@ -53,11 +61,9 @@ src_compile () {
 		$(use_with pulseaudio) \
 		$(use_with wavpack) \
 		--with-distro="Gentoo"
-
-	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc NEWS ChangeLog README AUTHORS
 }