Version bump. Upstream changelog mentions .wav segfault bugfixes, local bugfixes stripped. PPC please test.

4 files changed, 75 insertions, 17 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 3d1409baa8fd..bb0207e99b47 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2004/11/11 23:32:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.36 2004/11/20 18:46:42 chainsaw Exp $
+
+*sox-12.17.6 (20 Nov 2004)
+
+  20 Nov 2004; Tony Vroon <chainsaw@gentoo.org> +sox-12.17.6.ebuild:
+  Version bump. Upstream changelog mentions .wav segfault bug fixes, PPC users
+  please test this.
 
   12 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> sox-12.17.5-r1.ebuild:
   Stable on alpha.
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 02cef2d2dbc4..9a0d16ea29fa 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8a50b59dbb11f3d76e5536feb0325641 ChangeLog 4467
+MD5 ed0c3639847f9d7417453e978f89cb16 sox-12.17.6.ebuild 1796
 MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 cee6945888ca075bc242cf5d9bc636ff sox-12.17.5-r1.ebuild 2037
 MD5 58d48629a7a079e4b351cf17c1cf7ebf sox-12.17.4-r2.ebuild 1586
+MD5 cee6945888ca075bc242cf5d9bc636ff sox-12.17.5-r1.ebuild 2037
+MD5 01f9300c49eac50309481e014b824028 ChangeLog 4664
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
-MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
-MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
-MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
+MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6 63
 MD5 8a1b39117b61aeb3d136106f13347185 files/sox-wave-overflow.patch 736
+MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
+MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
 MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5-r1 63
+MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
 MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBk/aPugEuf3OQ0akRAvBhAJ4/fcpqznSObYrk2HjQOWFY3J957QCggSLb
-o3cBIzkqlTllnNnvbNliPvw=
-=hRZ2
------END PGP SIGNATURE-----
diff --git a/media-sound/sox/files/digest-sox-12.17.6 b/media-sound/sox/files/digest-sox-12.17.6
new file mode 100644
index 000000000000..6968a762dfcd
--- /dev/null
+++ b/media-sound/sox/files/digest-sox-12.17.6
@@ -0,0 +1 @@
+MD5 ea368e7baf6618a2116f3ed6c111bd4a sox-12.17.6.tar.gz 444125
diff --git a/media-sound/sox/sox-12.17.6.ebuild b/media-sound/sox/sox-12.17.6.ebuild
new file mode 100644
index 000000000000..ac86c26587a4
--- /dev/null
+++ b/media-sound/sox/sox-12.17.6.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.6.ebuild,v 1.1 2004/11/20 18:46:42 chainsaw Exp $
+
+inherit gnuconfig flag-o-matic
+
+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 )
+	oggvorbis? ( media-libs/libvorbis )
+	mad? ( media-sound/madplay )"
+#	alsa? ( media-libs/alsa-lib )
+
+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
+
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+
+	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
+}