Update to 1.2rc2:

This release splits the speex codec library and the speex DSP
library into separate source trees. Both projects received build-system
improvements, bugfixes, and cleanup. The speex codec's VBR tuning
was improved, while the speexdsp resampler got some NEON optimizations.

5 files changed, 19 insertions, 47 deletions

diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 34f5400f12a..6e0c3d09bbe 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2012/10/02 23:48:09 asau Exp $
-#
+# $NetBSD: Makefile,v 1.33 2015/01/16 08:50:47 wiz Exp $
 
-DISTNAME=	speex-1.2rc1
-PKGREVISION=	1
+DISTNAME=	speex-1.2rc2
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
 
@@ -14,7 +12,6 @@ LICENSE=	modified-bsd
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	speex.pc.in
-PKGCONFIG_OVERRIDE+=	speexdsp.pc.in
 USE_TOOLS+=		pkg-config
 
 # previous versions of the package were called Speex
diff --git a/audio/speex/PLIST b/audio/speex/PLIST
index bdd3dbaf27e..2e67ae02c64 100644
--- a/audio/speex/PLIST
+++ b/audio/speex/PLIST
@@ -1,22 +1,15 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:32:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/01/16 08:50:47 wiz Exp $
 bin/speexdec
 bin/speexenc
 include/speex/speex.h
 include/speex/speex_bits.h
-include/speex/speex_buffer.h
 include/speex/speex_callbacks.h
 include/speex/speex_config_types.h
-include/speex/speex_echo.h
 include/speex/speex_header.h
-include/speex/speex_jitter.h
-include/speex/speex_preprocess.h
-include/speex/speex_resampler.h
 include/speex/speex_stereo.h
 include/speex/speex_types.h
 lib/libspeex.la
-lib/libspeexdsp.la
 lib/pkgconfig/speex.pc
-lib/pkgconfig/speexdsp.pc
 man/man1/speexdec.1
 man/man1/speexenc.1
 share/aclocal/speex.m4
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
index 6e73a90cd2c..c5207259f9c 100644
--- a/audio/speex/distinfo
+++ b/audio/speex/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2014/01/01 03:03:01 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2015/01/16 08:50:47 wiz Exp $
 
-SHA1 (speex-1.2rc1.tar.gz) = 52daa72572e844e5165315e208da539b2a55c5eb
-RMD160 (speex-1.2rc1.tar.gz) = 6f4a11ef910b0db9b820826bcac3da1b79cad3a1
-Size (speex-1.2rc1.tar.gz) = 1061882 bytes
-SHA1 (patch-ab) = 377ce413ee4a644327841597ba182f1b67e8eab8
-SHA1 (patch-libspeex_scal.c) = 25f6391b4500a35a04d4a5b12a3fb313778885f1
+SHA1 (speex-1.2rc2.tar.gz) = 03ce8418c4e05cb166374bfadef46e7646da62e1
+RMD160 (speex-1.2rc2.tar.gz) = 3ef717a426b12172ada5b5d6d9e9e73b8f1e7219
+Size (speex-1.2rc2.tar.gz) = 1016729 bytes
+SHA1 (patch-ab) = 5bbe38404f2832126d8c0aab714e1d551d0e3d99
diff --git a/audio/speex/patches/patch-ab b/audio/speex/patches/patch-ab
index 41852bc751a..34ad3695b52 100644
--- a/audio/speex/patches/patch-ab
+++ b/audio/speex/patches/patch-ab
@@ -1,22 +1,24 @@
-$NetBSD: patch-ab,v 1.6 2009/05/09 13:22:55 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2015/01/16 08:50:47 wiz Exp $
 
---- src/Makefile.in.orig	2008-07-20 22:17:20.000000000 -0400
+Add getopt/ossaudio libraries where needed.
+
+--- src/Makefile.in.orig	2014-12-06 19:58:25.000000000 +0000
 +++ src/Makefile.in
-@@ -138,7 +138,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+@@ -248,7 +248,7 @@ LD = @LD@
  LDFLAGS = @LDFLAGS@
+ LIBM = @LIBM@
  LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
 +LIBS = @LIBS@ ${LIBGETOPT}
  LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
  LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-@@ -224,11 +224,11 @@ include_HEADERS = 
+@@ -351,11 +351,11 @@ include_HEADERS = 
  noinst_HEADERS = wav_io.h
  speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
- speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
--	$(OGG_LIBS)  @FFT_LIBS@	
-+	$(OGG_LIBS)  @FFT_LIBS@	$(LIBOSSAUDIO)
+ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la \
+-	$(OGG_LIBS)  @FFT_LIBS@	@SPEEXDSP_LIBS@
++	$(OGG_LIBS)  @FFT_LIBS@	@SPEEXDSP_LIBS@ $(LIBOSSAUDIO)
  
  speexdec_SOURCES = speexdec.c wav_io.c
  speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
diff --git a/audio/speex/patches/patch-libspeex_scal.c b/audio/speex/patches/patch-libspeex_scal.c
deleted file mode 100644
index 86a6edbd11f..00000000000
--- a/audio/speex/patches/patch-libspeex_scal.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-libspeex_scal.c,v 1.1 2014/01/01 03:03:02 ryoon Exp $
-
-Fix build on Fedora 22.
-From upstream,
-http://git.xiph.org/?p=speex.git;a=commitdiff_plain;h=42ef4a1d79eb85d450686e633500bc85450d8036
-
---- libspeex/scal.c.orig	2008-06-05 09:27:47.000000000 +0000
-+++ libspeex/scal.c
-@@ -52,6 +52,10 @@ The algorithm implemented here is descri
- #include <math.h>
- #include <stdlib.h>
- 
-+#ifndef M_PI
-+#define M_PI	3.14159265358979323846  /* pi */
-+#endif
-+
- #define ALLPASS_ORDER 20
- 
- struct SpeexDecorrState_ {