Destdir patch added. Alsa support added. Closes bug #75778.

5 files changed, 178 insertions, 9 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index bf0081174dfe..a44cf11145ea 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.38 2004/12/29 01:14:03 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.39 2004/12/31 23:00:30 eradicator Exp $
+
+*sox-12.17.6-r1 (31 Dec 2004)
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sox-12.17.6-destdir.patch, +sox-12.17.6-r1.ebuild:
+  Destdir patch added.  Alsa support added.  Closes bug #75778.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index e39cc7e744ed..7dd49e92d921 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,14 +1,16 @@
-MD5 eb4891dba9f383c5ae21e3813e275490 sox-12.17.6.ebuild 1891
-MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
 MD5 72a5834bc9abc7cb4ab908f620b58c86 ChangeLog 4854
-MD5 58d48629a7a079e4b351cf17c1cf7ebf sox-12.17.4-r2.ebuild 1586
-MD5 cee6945888ca075bc242cf5d9bc636ff sox-12.17.5-r1.ebuild 2037
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 bed3d88f07d84824e45c7baf1231fc5d sox-12.17.3-r3.ebuild 1042
+MD5 cee6945888ca075bc242cf5d9bc636ff sox-12.17.5-r1.ebuild 2037
+MD5 58d48629a7a079e4b351cf17c1cf7ebf sox-12.17.4-r2.ebuild 1586
+MD5 eb4891dba9f383c5ae21e3813e275490 sox-12.17.6.ebuild 1891
+MD5 429c3db6297c293291dbf46d6f9a2fee sox-12.17.6-r1.ebuild 1384
+MD5 a27f4560530e1dcd5ee4ff1bc4a6f921 files/digest-sox-12.17.3-r3 63
 MD5 55b945c4cad98947d37be88cf3c5ef7e files/sox-soundcard.patch 275
-MD5 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
+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 923124d7fbe0a70712b4991ae52a968b files/sox-wav-segfault.patch 255
+MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
 MD5 12cd6316db89eaf0efe7f5f33b5be707 files/digest-sox-12.17.5-r1 63
 MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6 63
-MD5 484937b1ac7761dfb4d5bfb011e8cae7 files/sox-install.patch 2917
-MD5 64aef0b430e70836aae794f8e91ea8dc files/digest-sox-12.17.4-r2 63
+MD5 d489ca9068a273a4a383094d2336edff files/digest-sox-12.17.6-r1 63
diff --git a/media-sound/sox/files/digest-sox-12.17.6-r1 b/media-sound/sox/files/digest-sox-12.17.6-r1
new file mode 100644
index 000000000000..6968a762dfcd
--- /dev/null
+++ b/media-sound/sox/files/digest-sox-12.17.6-r1
@@ -0,0 +1 @@
+MD5 ea368e7baf6618a2116f3ed6c111bd4a sox-12.17.6.tar.gz 444125
diff --git a/media-sound/sox/files/sox-12.17.6-destdir.patch b/media-sound/sox/files/sox-12.17.6-destdir.patch
new file mode 100644
index 000000000000..61f1b1465c50
--- /dev/null
+++ b/media-sound/sox/files/sox-12.17.6-destdir.patch
@@ -0,0 +1,101 @@
+diff -Naur sox-12.17.6.orig/Makefile.in sox-12.17.6/Makefile.in
+--- sox-12.17.6.orig/Makefile.in	2004-09-01 15:04:02.000000000 -0700
++++ sox-12.17.6/Makefile.in	2004-12-31 14:54:27.366893587 -0800
+@@ -29,22 +29,22 @@
+ 
+ install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
+ 	cd src && $(MAKE) $@
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(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)$(mandir)/man1
++	$(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
++	$(LN_S) sox.1 $(DESTDIR)$(mandir)/man1/soxmix.1
++	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(DESTDIR)$(mandir)/man1
+ 
+ install-play:
+-	if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
+-	$(srcdir)/mkinstalldirs $(mandir)/man1
+-	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
+-	$(LN_S) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
++	if [ -f $(DESTDIR)$(mandir)/man1/rec.1 ]; then $(RM) $(DESTDIR)$(mandir)/man1/rec.1; fi
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(DESTDIR)$(mandir)/man1
++	$(LN_S) play.1 $(DESTDIR)$(mandir)/man1/rec.1
+ 
+ install-lib:
+ 	cd src && $(MAKE) $@
+-	$(srcdir)/mkinstalldirs $(mandir)/man3
+-	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(mandir)/man3
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 $(srcdir)/libst.3 $(DESTDIR)$(mandir)/man3
+ 
+ 
+ PLAY_UNINSTALL_0    =
+diff -Naur sox-12.17.6.orig/src/Makefile.in sox-12.17.6/src/Makefile.in
+--- sox-12.17.6.orig/src/Makefile.in	2004-10-02 18:02:24.000000000 -0700
++++ sox-12.17.6/src/Makefile.in	2004-12-31 14:55:28.187874002 -0800
+@@ -102,24 +102,24 @@
+ PLAY_INSTALL_1    = install-play
+ 
+ install: sox soxmix $(PLAY_INSTALL_$(PLAY_SUPPORT))
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) -c -m 755 sox $(bindir)
+-	$(INSTALL) -c -m 755 soxmix $(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 sox $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 soxmix $(DESTDIR)$(bindir)
+ 
+ install-play:
+-	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec; fi
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL) -c -m 755 play $(bindir)
+-	$(LN_S) $(bindir)/play $(bindir)/rec
++	if [ -f $(DESTDIR)$(bindir)/rec ] ; then $(RM) $(DESTDIR)$(bindir)/rec; fi
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL) -c -m 755 play $(DESTDIR)$(bindir)
++	$(LN_S) play $(DESTDIR)$(bindir)/rec
+ 
+ install-lib: libst.a
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_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)/st.h $(includedir)
+-	$(INSTALL) -c -m 644 ststdint.h $(includedir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_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)/st.h $(DESTDIR)$(includedir)
++	$(INSTALL) -c -m 644 ststdint.h $(DESTDIR)$(includedir)
+ 
+ PLAY_UNINSTALL_0    =
+ PLAY_UNINSTALL_1    = uninstall-play
+diff -Naur sox-12.17.6.orig/src/gsm/Makefile.in sox-12.17.6/src/gsm/Makefile.in
+--- sox-12.17.6.orig/src/gsm/Makefile.in	2004-09-24 11:47:01.000000000 -0700
++++ sox-12.17.6/src/gsm/Makefile.in	2004-12-31 14:55:59.685685079 -0800
+@@ -77,12 +77,12 @@
+ 	$(RANLIB) libgsm.a
+ 
+ install-lib: libgsm.a
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_srcdir)/mkinstalldirs $(mandir)/man3
+-	$(INSTALL) -c -m 644 libgsm.a $(libdir)
+-	$(RANLIB) $(libdir)/libgsm.a
+-	$(INSTALL) -c -m 644 gsm.3 $(mandir)/man3
+-	$(INSTALL) -c -m 644 gsm_option.3 $(mandir)/man3
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 libgsm.a $(DESTDIR)$(libdir)
++	$(RANLIB) $(DESTDIR)$(libdir)/libgsm.a
++	$(INSTALL) -c -m 644 gsm.3 $(DESTDIR)$(mandir)/man3
++	$(INSTALL) -c -m 644 gsm_option.3 $(DESTDIR)$(mandir)/man3
+ 
+ uninstall-lib:
+ 	$(RM) $(libdir)/libgsm.a
diff --git a/media-sound/sox/sox-12.17.6-r1.ebuild b/media-sound/sox/sox-12.17.6-r1.ebuild
new file mode 100644
index 000000000000..6a84792b72fc
--- /dev/null
+++ b/media-sound/sox/sox-12.17.6-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.6-r1.ebuild,v 1.1 2004/12/31 23:00:30 eradicator Exp $
+
+IUSE="oggvorbis mad encode alsa oss"
+
+inherit gnuconfig flag-o-matic eutils
+
+DESCRIPTION="The swiss army knife of sound processing programs"
+HOMEPAGE="http://sox.sourceforge.net"
+SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+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_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Needed on mips and probablly others
+	gnuconfig_update
+
+	epatch ${FILESDIR}/sox-12.17.6-destdir.patch
+}
+
+src_compile () {
+	# 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} `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() {
+	make DESTDIR="${D}" install || die
+	prepallman
+
+	dodoc Changelog README TODO *.txt
+}