Changes 14.3.1:

* Several fixes incl. multi-core MS-Windows threading problem.
* New MS-Windows native audio driver.
* New Grandstream ringtone file format.
* New support in libSoX for memory based file IO.
* Now able to set MP3 compression parameters.

5 files changed, 32 insertions, 15 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 4dca716ca79..4b3a780e072 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2009/02/21 13:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/07/23 07:55:12 adam Exp $
 
-DISTNAME=	sox-14.0.1
-PKGREVISION=	2
+DISTNAME=	sox-14.3.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sox/}
 
@@ -12,11 +11,13 @@ COMMENT=	SOund eXchange - universal sound sample translator
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
 #USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-gomp
+CONFIGURE_ARGS+=	--without-libltdl
 
 SUBST_CLASSES+=		gsm
 SUBST_FILES.gsm=	configure src/gsm.c src/wav.c CMakeLists.txt
@@ -24,14 +25,14 @@ SUBST_SED.gsm=		-e "s!gsm/gsm.h!gsm.h!"
 SUBST_STAGE.gsm=	pre-configure
 
 post-install:
-	-${RMDIR} ${DESTDIR}${PREFIX}/lib/sox
+	${RMDIR} ${DESTDIR}${PREFIX}/lib/sox
 
 .include "options.mk"
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/PLIST b/audio/sox/PLIST
index 25cb6747321..cff472b47b7 100644
--- a/audio/sox/PLIST
+++ b/audio/sox/PLIST
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/27 08:19:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/07/23 07:55:12 adam Exp $
 bin/play
 bin/rec
 bin/sox
+bin/soxi
 include/sox.h
 include/soxstdint.h
-lib/libsfx.la
 lib/libsox.la
+lib/pkgconfig/sox.pc
 man/man1/play.1
 man/man1/rec.1
 man/man1/sox.1
+man/man1/soxi.1
 man/man3/libsox.3
 man/man7/soxeffect.7
-man/man7/soxexam.7
 man/man7/soxformat.7
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index 635eccdab39..c7addaa1901 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2008/04/27 08:19:54 wiz Exp $
+$NetBSD: distinfo,v 1.19 2010/07/23 07:55:12 adam Exp $
 
-SHA1 (sox-14.0.1.tar.gz) = b4b07e9905728209d3c97b9fb0fc65e75b4c45a1
-RMD160 (sox-14.0.1.tar.gz) = b614c3006e9490876c299d768009656704ecfbc8
-Size (sox-14.0.1.tar.gz) = 859538 bytes
+SHA1 (sox-14.3.1.tar.gz) = ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384
+RMD160 (sox-14.3.1.tar.gz) = d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7
+Size (sox-14.3.1.tar.gz) = 1044595 bytes
+SHA1 (patch-aa) = e6f3d06450862795648622a017b2c696328872f5
diff --git a/audio/sox/options.mk b/audio/sox/options.mk
index b59b855e052..783d4828bcf 100644
--- a/audio/sox/options.mk
+++ b/audio/sox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/04/27 08:19:54 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2010/07/23 07:55:12 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sox
 PKG_SUPPORTED_OPTIONS=	lame oss
@@ -12,5 +12,5 @@ PKG_SUGGESTED_OPTIONS=
 .endif
 
 .if empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+=	--enable-oss=no
+CONFIGURE_ARGS+=	--without-oss
 .endif
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
new file mode 100644
index 00000000000..d2c8f804f96
--- /dev/null
+++ b/audio/sox/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.13 2010/07/23 07:55:12 adam Exp $
+
+--- src/sox.c.orig	2010-07-22 15:31:02.000000000 +0000
++++ src/sox.c
+@@ -1216,7 +1216,9 @@ static void adjust_volume(int delta)
+       vol2 = range_limit(vol1 + delta, 0, 100);
+       AUDIO_INITINFO(&audio_info);
+       audio_info.play.gain = (vol2 * AUDIO_MAX_GAIN + 50) / 100;
++#if !defined(__NetBSD__)
+       audio_info.output_muted = 0;
++#endif
+       lsx_debug("%04x %04x", vol1, vol2);
+       if (vol1 != vol2 && ioctl(fd, AUDIO_SETINFO, &audio_info) < 0)
+         vol2 = vol1;