disable ALSA support in sox since it's broken

5 files changed, 75 insertions, 8 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index e552cbb3e7cf..2fbe9d47983c 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.30 2004/09/11 17:06:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.31 2004/09/11 17:17:32 cardoe Exp $
+
+*sox-12.17.5-r1 (11 Sep 2004)
+
+  11 Sep 2004; Doug Goldstein <cardoe@gentoo.org> +sox-12.17.5-r1.ebuild:
+  Disable ALSA support because it's broken in sox. See bug #63531.
 
   11 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> sox-12.17.5.ebuild:
   ALSA support is broken... using OSS by default.
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 3f0bd1b28dd9..48785f6fc391 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,11 +1,13 @@
-MD5 a896616e0e99201970278b77d219de0f ChangeLog 3553
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
 MD5 262c7476349bc47f8a4cff33c51815fa sox-12.17.4-r2.ebuild 1505
+MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a896616e0e99201970278b77d219de0f ChangeLog 3553
+MD5 e98e8a3cbcf2c2dddf09ab069adde30a sox-12.17.5-r1.ebuild 1801
 MD5 7c0cc5bc8e9d3e32f909c16febad18fb sox-12.17.5.ebuild 1337
-MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
 MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
-MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
-MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
+MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
 MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5 63
+MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
 MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
+MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5-r1 63
+MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
diff --git a/media-sound/sox/files/digest-sox-12.17.5-r1 b/media-sound/sox/files/digest-sox-12.17.5-r1
new file mode 100644
index 000000000000..8395fd9564b1
--- /dev/null
+++ b/media-sound/sox/files/digest-sox-12.17.5-r1
@@ -0,0 +1 @@
+MD5 53a3ebe3da0f5845770fd99e2ff0a965 sox-12.17.5.tar.gz 429726
diff --git a/media-sound/sox/sox-12.17.5-r1.ebuild b/media-sound/sox/sox-12.17.5-r1.ebuild
new file mode 100644
index 000000000000..210d35049f98
--- /dev/null
+++ b/media-sound/sox/sox-12.17.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5-r1.ebuild,v 1.1 2004/09/11 17:17:32 cardoe Exp $
+
+inherit gnuconfig eutils
+
+DESCRIPTION="The swiss army knife of sound processing programs"
+HOMEPAGE="http://sox.sourceforge.net"
+SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
+
+IUSE="oggvorbis mad encode" # alsa oss
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
+LICENSE="LGPL-2.1"
+
+DEPEND="virtual/libc
+	encode? ( media-sound/lame )
+	alsa? ( media-libs/alsa-lib )
+	oggvorbis? ( media-libs/libvorbis )
+	mad? ( media-sound/madplay )"
+
+src_compile () {
+	# Needed on mips and probablly others
+	gnuconfig_update
+
+	# from version 12.17.4 sox has mp3 encoding/decoding if you have madlibs 
+	# and lame using alsa by default
+	local myconf
+
+	epatch ${FILESDIR}/${PN}-soundcard.patch
+	epatch ${FILESDIR}/${PN}-install.patch
+
+	myconf="${myconf} `use_enable oggvorbis ogg-vorbis`"
+	myconf="${myconf} `use_enable mad`"
+	myconf="${myconf} `use_enable encode lame`"
+	myconf="${myconf} --enable-oss-dsp"
+#	myconf="${myconf} `use_enable oss oss-dsp`"
+#	myconf="${myconf} `use_enable alsa alsa-dsp`"
+
+#	SoX currently targets the ALSA kernel API and not alsa-lib. This is a problem because the interface changes.
+#	see bug #63531 for more details
+# 	The build will automatically disable ALSA support even if it's in USE
+	myconf="${myconf} --disable-alsa-dsp"
+	einfo "Notice.. ALSA support is currently broken in sox. ALSA support has been disabled."
+	einfo "sox will automatically use OSS, if you have ALSA then it'll work through the"
+	einfo "compatiblity layer."
+
+	econf ${myconf} \
+		--enable-fast-ulaw \
+		--enable-fast-alaw || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	prepallman
+
+	dodoc Changelog README TODO *.txt
+}
diff --git a/media-sound/sox/sox-12.17.5.ebuild b/media-sound/sox/sox-12.17.5.ebuild
index 8228530cce45..30cc8bba73b3 100644
--- a/media-sound/sox/sox-12.17.5.ebuild
+++ b/media-sound/sox/sox-12.17.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.5.ebuild,v 1.3 2004/09/11 17:17:32 cardoe Exp $
 
 inherit gnuconfig eutils