Update to 14.0.1. Reenable flac support.

sox-14.0.1	2008-01-29
----------

  File formats:

  o Added support for non-standard, non-WAVE_FORMAT_EXTENSIBLE
    (esp. 24-bit) PCM wav (see wavpcm in soxformat.7 for details).  (robs)

  Effects:

  o Reimplemented reverb to be similar to freeverb.  (robs)

  Bug fixes:

  o Fix Sndtool read error causing noise at start.  (Reynir Stefánsson)
  o Fix mixer with >4 numbers, and mixer -3 behaving as mixer -4.  (robs)
  o Fix [1748909] sox does not report remaining playtime of mp3s.  (robs)
  o Fix failure to read AIFF files with empty MARK chunk.  (robs)
  o Fix spurious 'Premature EOF' message in some circumstances.  (robs)
  o Switched to 16-bit for libao driver since not all its plugins
    support it (such as oss, nas, and pulse audio) (Morita Sho)
  o Stop crash when "rec" is run with no arguments (Morita Sho).
  o Fix -V (without argument) on non-gnu systems.  (robs)
  o Fix reported (with -V) output audio length in some cases.  (robs)
  o Fix actual FLAC output file audio length in some cases.  (robs)
  o Fix poor 24-bit FLAC compression & support newer versions of
    libFLAC (1.2.x).  (robs)
  o Fix loss of 1 decoded FLAC block when using "trim 0 ...".  (robs)
  o Fix trim when first effect with IMA-ADPCM input wav file.  (robs)

  Internal improvements:

  o Let "make distcheck" run some automated test scripts.
  o Distribute missing cmake files.
  o Fix ogg vorbis compile error on some platforms.
  o Remove unused libltdl that could cause header mismatch with
    installed libltdl.
  o Fix AMR detection with --disable-shared.  (robs)
  o Updated configure to support linking to static libraries
    on mingw for flac, ogg, and libsamplerate libraries.


sox-14.0.0	2007-09-11
----------

  File formats:

  o Added ffmpeg support.  (Reuben Thomas)
  o FLAC: added seekable decoding; added seek-table generation.  (robs)
  o Added M3U & PLS playlist formats [FR# 1667341] (Note: SHOUTcast PLS
    is only partially supported).  (robs)
  o Made format readers and writers into individual modules for easier
    distribution of differently-licensed code.  (Reuben Thomas)
  o Added libao support.  (Reuben Thomas)
  o Added support for ADPCM-encoded PRC files, based on Danny Smith's
    rec2wav and sndcmp.  (Reuben Thomas)
  o Added AMR-NB [FR# 728875] & AMR-WB formats (with external libs).  (robs)
  o Added LPC-10 support.  (Reuben Thomas)

  Effects:

  o Use LADSPA effects (one input, one output).  (Reuben Thomas)
  o --octave option changed to --plot; can now also use gnuplot to
    plot effect transfer function.  (robs)
  o Added soft-knee companding.  (robs)
  o Show (with --plot) compand transfer function.  (robs)
  o Allow e.g. "vol 6dB" (as well as "vol 6 dB").  (robs)
  o Changed deemph filter from 1st order to 2nd order for
    better accuracy.  (robs)
  o Add option to silence effect to leave periods of silence
    in and only strip out extra silence.   (Mark Schreiber)
  o synth can now generate any number of channels.  (robs)
  o mixer can now mixdown to mono any number of channels.  (robs)
  o Added oops effect (mixer special case).  (robs)
  o All effects that could only work on mono or stereo audio, now
    work with any number of channels.  (robs)
  o Added WSOLA-based key and tempo effects.  (robs)

  Other new features:

  o Show (with -S) if clipping is occurring.  (robs)
  o Added internet input file support (needs wget).  (robs)
  o Made it possible to build without sound drivers.  (Reuben Thomas)

  Bug fixes:

  o Fix (m)compand transfer function non-linearities; fix compand
    drain volume.  (robs)
  o Fix crash with pan effect.  (robs)
  o Add missing RM define to Makefiles so installs work.
   (Bug# 1666599) (cbagwell)
  o Fix I/O performance regression in 13.0.0.  (Reuben Thomas)
  o Fix .lu, .la read regression in 13.0.0 [Bug# 1715076].  (robs)
  o Fix uncompressed NIST/Sphere read regression in v13 [Bug #1736016].
  o Fix displayed times when playing a file and using trim.  (robs)
  o Fix CDDA sector duration display for non-CDDA sample rates.  (robs)
  o synth fixes: brown noise; inverted square wave; offset < 0.  (robs)
  o Fix crash when encoding Vorbis or FLAC: with no comment.  (robs)
  o Fix effect drain problems: chorus, echo(s), phaser.  (robs)
  o Fix rabbit responsiveness and memory problems.  (Peter Samuelson)
  o Fix broken stereo audio when recording using ALSA.  (robs)
  o Fix OSS driver on big endian machines that was introduced in
    last release.

  Internal improvements:

  o Renamed libst to libsox for name recongition and to avoid
    duplications with other existing libst libraries.  (Reuben Thomas)
  o Moved effects to libsfx.  (Reuben Thomas)
  o Got rid of several hundred compiler warnings.  (robs, Reuben Thomas)
  o Added basic performance testing of I/O.  (Reuben Thomas)
  o Effects chain processing now available in libSoX.  (robs)
  o Added effects-chain buffering for effects that use a window [FR#
    1621695].  (robs)
  o Added cmake build files for Win32.  (robs)

8 files changed, 23 insertions, 89 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 802f12ca4af..2edb815a85d 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2007/08/06 05:28:36 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2008/04/27 08:19:54 wiz Exp $
 
-DISTNAME=	sox-13.0.0
-PKGREVISION=	1
+DISTNAME=	sox-14.0.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sox/}
 
@@ -11,23 +10,22 @@ COMMENT=	SOund eXchange - universal sound sample translator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
+#USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 
-SUBST_CLASSES+=		lrf
-SUBST_FILES.lrf=	src/libst-config.in
-SUBST_SED.lrf=		-e "s!@LRF@!"${LINKER_RPATH_FLAG}"!"
-SUBST_STAGE.lrf=	pre-configure
-
 SUBST_CLASSES+=		gsm
-SUBST_FILES.gsm=	configure src/gsm.c src/wav.c
+SUBST_FILES.gsm=	configure src/gsm.c src/wav.c CMakeLists.txt
 SUBST_SED.gsm=		-e "s!gsm/gsm.h!gsm.h!"
 SUBST_STAGE.gsm=	pre-configure
 
+post-install:
+	-${RMDIR} ${DESTDIR}${PREFIX}/lib/sox
+
 .include "options.mk"
 
-# needs obsolete FLAC API
-#.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/audio/sox/PLIST b/audio/sox/PLIST
index 114bb1facff..25cb6747321 100644
--- a/audio/sox/PLIST
+++ b/audio/sox/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/22 23:23:03 wiz Exp $
-bin/libst-config
+@comment $NetBSD: PLIST,v 1.5 2008/04/27 08:19:54 wiz Exp $
 bin/play
 bin/rec
 bin/sox
-include/st.h
-include/ststdint.h
-lib/libst.la
+include/sox.h
+include/soxstdint.h
+lib/libsfx.la
+lib/libsox.la
 man/man1/play.1
 man/man1/rec.1
 man/man1/sox.1
-man/man3/libst.3
+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 d250d48b015..635eccdab39 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.17 2007/08/06 05:28:36 wiz Exp $
+$NetBSD: distinfo,v 1.18 2008/04/27 08:19:54 wiz Exp $
 
-SHA1 (sox-13.0.0.tar.gz) = db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4
-RMD160 (sox-13.0.0.tar.gz) = 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2
-Size (sox-13.0.0.tar.gz) = 725259 bytes
-SHA1 (patch-aa) = 46421ae6d228132b9719df6129b49bdb78174a42
-SHA1 (patch-ab) = 3973227e19b0a1128b8faa4ab88074dcf51e100d
-SHA1 (patch-ac) = 53aee94b525c7856c49c8c948377c88973f2e651
-SHA1 (patch-ad) = efe2df76606544754a2c6d44bd9488e359a8caa8
+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
diff --git a/audio/sox/options.mk b/audio/sox/options.mk
index a9d9fa4419c..b59b855e052 100644
--- a/audio/sox/options.mk
+++ b/audio/sox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/08/06 05:28:37 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/27 08:19:54 wiz 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+=	--without-oss
+CONFIGURE_ARGS+=	--enable-oss=no
 .endif
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
deleted file mode 100644
index 89ce9315efd..00000000000
--- a/audio/sox/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2007/08/06 05:28:37 wiz Exp $
-
---- configure.orig	2007-02-11 19:48:36.000000000 +0000
-+++ configure
-@@ -20671,6 +20671,8 @@ _ACEOF
- 
- fi
- 
-+if test "$with_oss" != no; then
-+
- with_oss=no
- 
- for ac_header in sys/soundcard.h
-@@ -20972,6 +20974,8 @@ fi
- 
- done
- 
-+fi
-+
- if test "$with_oss" = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
deleted file mode 100644
index c9fd9805b7e..00000000000
--- a/audio/sox/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2007/02/22 23:23:04 wiz Exp $
-
---- src/Makefile.in.orig	2007-02-11 19:49:58.000000000 +0000
-+++ src/Makefile.in
-@@ -164,6 +164,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
- RANLIB = @RANLIB@
-+RM = rm -f
- SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
- SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
- SED = @SED@
diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac
deleted file mode 100644
index f46b460d3c9..00000000000
--- a/audio/sox/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2007/02/22 23:23:04 wiz Exp $
-
---- Makefile.in.orig	2007-02-11 19:48:39.000000000 +0000
-+++ Makefile.in
-@@ -136,6 +136,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
- RANLIB = @RANLIB@
-+RM = rm -f
- SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
- SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
- SED = @SED@
diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad
deleted file mode 100644
index 85de06c618e..00000000000
--- a/audio/sox/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2007/02/22 23:34:43 wiz Exp $
-
---- src/libst-config.in.orig	2004-09-01 19:49:24.000000000 +0000
-+++ src/libst-config.in
-@@ -17,9 +17,9 @@ case "$1" in
- --libdir)
-         echo $libdir;;
- --libs)
--        echo $libs;;
-+        echo "@LRF@'$libdir' -L'$libdir' $libs";;
- --cflags)
--        echo "-L'$libdir' -I'$includedir'";;
-+        echo -I$includedir;;
- *)
-         echo "Usage: $0 [--prefix|--includedir|--libdir|--cflags|--libs]"
-         exit 1;;