Version bump closes bug #62854.

6 files changed, 136 insertions, 1 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index a1f0c0a704bf..3ddf362a6df1 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.28 2004/08/11 20:40:35 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.29 2004/09/09 21:24:05 eradicator Exp $
+
+*sox-12.17.5 (09 Sep 2004)
+
+  09 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sox-install.patch, +files/sox-soundcard.patch, +sox-12.17.5.ebuild:
+  Version bump closes bug #62854.
 
   11 Aug 2004; Brian Harring <ferringb@gentoo.org> sox-12.17.4-r2.ebuild: 
   Use flag operators -must- be wrapped in parenthesis, blah? node isn't valid.
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 6091683cc850..7b59cfc2b119 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -2,6 +2,10 @@ MD5 e1eac27c39f90f15d80469afa40bd9a6 ChangeLog 3226
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
 MD5 262c7476349bc47f8a4cff33c51815fa sox-12.17.4-r2.ebuild 1505
+MD5 7c9d355d32f7b7632ce382316d9d7408 sox-12.17.5.ebuild 1296
 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 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5 63
+MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
diff --git a/media-sound/sox/files/digest-sox-12.17.5 b/media-sound/sox/files/digest-sox-12.17.5
new file mode 100644
index 000000000000..8395fd9564b1
--- /dev/null
+++ b/media-sound/sox/files/digest-sox-12.17.5
@@ -0,0 +1 @@
+MD5 53a3ebe3da0f5845770fd99e2ff0a965 sox-12.17.5.tar.gz 429726
diff --git a/media-sound/sox/files/sox-install.patch b/media-sound/sox/files/sox-install.patch
new file mode 100644
index 000000000000..1ce759a6d968
--- /dev/null
+++ b/media-sound/sox/files/sox-install.patch
@@ -0,0 +1,63 @@
+--- sox/Makefile.in~	Sat Feb  8 15:38:25 2003
++++ sox/Makefile.in	Tue Feb 18 21:04:32 2003
+@@ -98,35 +98,35 @@
+ PLAY_INSTALL_1    = install-play
+ 
+ install: sox soxmix $(PLAY_INSTALL_$(PLAY_SUPPORT))
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(INSTALL) -c -m 755 sox $(bindir)
+-	$(INSTALL) -c -m 755 soxmix $(bindir)
+-	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(mandir)/man1
+-	if [ -f $(mandir)/man1/soxmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
+-	$(LN_S) $(mandir)/man1/sox.1 $(mandir)/man1/soxmix.1
+-	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(mandir)/man1
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -c -m 755 sox $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 soxmix $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(DESTDIR)$(mandir)/man1
++	if [ -f $(DESTDIR)$(mandir)/man1/soxmix.1 ] ; then $(RM) $(DESTDIR)$(mandir)/man1/soxmix.1; fi
++	echo ".so sox.1" > $(DESTDIR)$(mandir)/man1/soxmix.1
++	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(mandir)/man1
+ 
+ install-play:
+-	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec; fi
+-	if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) -c -m 755 play $(bindir)
+-	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
+-	$(LN_S) $(bindir)/play $(bindir)/rec
+-	$(LN_S) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
++	if [ -f $(DESTDIR)$(bindir)/rec ] ; then $(RM) $(DESTDIR)$(bindir)/rec; fi
++	if [ -f $(DESTDIR)$(mandir)/man1/rec.1 ]; then $(RM) $(DESTDIR)$(mandir)/man1/rec.1; fi
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 play $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(mandir)/man1
++	$(LN_S) $(bindir)/play $(DESTDIR)$(bindir)/rec
++	echo ".so sox.1" > $(DESTDIR)$(mandir)/man1/rec.1
+ 
+ install-lib: libst.a
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(srcdir)/mkinstalldirs $(mandir)/man3
+-	$(srcdir)/mkinstalldirs $(includedir)
+-	$(INSTALL) -c -m 755 libst-config $(bindir)
+-	$(INSTALL) -c -m 644 libst.a $(libdir)
+-	$(RANLIB) $(libdir)/libst.a
+-	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(mandir)/man3
+-	$(INSTALL) -c -m 644 $(srcdir)/st.h $(includedir)
+-	$(INSTALL) -c -m 644 ststdint.h $(includedir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
++	$(INSTALL) -c -m 755 libst-config $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 644 libst.a $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libst.a
++	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 $(srcdir)/st.h $(DESTDIR)$(includedir)
++	$(INSTALL) -c -m 644 ststdint.h $(DESTDIR)$(includedir)
+ 
+ GSM_INSTALL_0       =
+ GSM_INSTALL_1       = install-gsmlib
diff --git a/media-sound/sox/files/sox-soundcard.patch b/media-sound/sox/files/sox-soundcard.patch
new file mode 100644
index 000000000000..296ee31f49f0
--- /dev/null
+++ b/media-sound/sox/files/sox-soundcard.patch
@@ -0,0 +1,11 @@
+--- sox-12.17.1/oss.c	Sun Aug 13 15:04:30 2000
++++ sox-12.17.1.acme/oss.c	Tue Nov 21 09:24:59 2000
+@@ -37,6 +37,8 @@
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ #include <machine/soundcard.h>
+ #endif
++/* hack */
++#include <linux/soundcard.h>
+ #include <sys/ioctl.h>
+ #include "st.h"
+ 
diff --git a/media-sound/sox/sox-12.17.5.ebuild b/media-sound/sox/sox-12.17.5.ebuild
new file mode 100644
index 000000000000..96d09ceb6017
--- /dev/null
+++ b/media-sound/sox/sox-12.17.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+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="alsa oss oggvorbis mad encode"
+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} `use_enable oss oss-dsp`"
+	myconf="${myconf} `use_enable alsa alsa-dsp`"
+
+	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
+}