Sat Nov 8 21:06:46 2008 UTC ()
Update to speex-1.2rc1.  This should be backward-compatible with
1.0.x versions.  Pulseaudio (which I am working on) requires
this version; moreover, the 1.0.x releases are deprecated.

The ChangeLog is not kept up-to-date, but here are some highlights:

1.2rc1
--------
Again, this new releases brings many improvements. The RAM requirement for
wideband has gone down drastically (i.e. more than 2x). A new resampler
module has been added, providing arbitrary sampling rate conversion --
fast. The echo canceller has also been improved. A bug in 1.2beta1 that
made the echo canceller unstable has been fixed. The echo canceller should
now converge faster, be robust and tolerant of incorrect capture-playback
synchronisation. The preprocessor has also been greatly improved. Not only
should the quality be better, but it is now fully converted to
fixed-point. At last, early TriMedia support (incomplete) has been merged.

1.2beta3
--------
The most obvious change in this release is that all the non-codec
components (preprocessor, echo cancellation, jitter buffer) have been
moved to a new libspeexdsp library. Other changes include a new jitter
buffer algorithm and resampler improvements/fixes. This is also the first
release where libspeex can be built without any floating point support. To
do this, the float compatibility API must be disabled (--disable-float-api
or DISABLE_FLOAT_API) and the VBR feature must be disabled (--disable-vbr
or DISABLE_VBR).

1.2beta2
--------
This release adds support for acoustic echo cancellation with multiple
microphones and multiple loudspeakers. It also adds an API to decorrelate
loudspeaker signals to improve multi-channel performance. In the bugfix
department, there are fixes for a few bugs in the echo canceller, jitter
buffer and preprocessor. At this point, the API for 1.2 should be stable
and only a few very minor additions are planned.


(bjs)
diff -r1.26 -r1.27 pkgsrc/audio/speex/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/speex/PLIST
diff -r1.10 -r1.11 pkgsrc/audio/speex/buildlink3.mk
diff -r1.11 -r1.12 pkgsrc/audio/speex/distinfo
diff -r1.3 -r0 pkgsrc/audio/speex/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/audio/speex/patches/patch-ab
diff -r1.1 -r0 pkgsrc/audio/speex/patches/patch-ac
cvs diff -r1.26 -r1.27 pkgsrc/audio/speex/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/speex/Makefile 2008/04/29 20:22:43 1.26
+++ pkgsrc/audio/speex/Makefile 2008/11/08 21:06:46 1.27
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.26 2008/04/29 20:22:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.27 2008/11/08 21:06:46 bjs Exp $
2# 2#
3 3
4DISTNAME= speex-1.0.5 4DISTNAME= speex-1.2rc1
5PKGREVISION= 1 
6CATEGORIES= audio 5CATEGORIES= audio
7MASTER_SITES= http://downloads.us.xiph.org/releases/speex/ 6MASTER_SITES= http://downloads.us.xiph.org/releases/speex/
8 7
9MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://www.speex.org/ 9HOMEPAGE= http://www.speex.org/
11COMMENT= Open-source, patent-free voice codec 10COMMENT= Open-source, patent-free voice codec
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15USE_LIBTOOL= YES 14USE_LIBTOOL= YES
16GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
17PKGCONFIG_OVERRIDE= speex.pc.in 16PKGCONFIG_OVERRIDE= speex.pc.in
 17PKGCONFIG_OVERRIDE= speexdsp.pc.in
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19 19
20# previous versions of the package were called Speex 20# previous versions of the package were called Speex
21CONFLICTS= Speex-[0-9]* 21CONFLICTS= Speex-[0-9]*
22 22
23CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}" 23CONFIGURE_ARGS+= --with-ogg-dir=${BUILDLINK_PREFIX.libogg:Q}
24 24
25# Avoid an ICE in gcc2 on sparc64 25# Avoid an ICE in gcc2 on sparc64
26CONFIGURE_ENV+= F77=${FALSE:Q} 26CONFIGURE_ENV+= F77=${FALSE:Q}
27 27
28BUILDLINK_TRANSFORM+= l:gnugetopt:getopt 28BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
29 29
 30.include "options.mk"
 31
30.include "../../devel/libgetopt/buildlink3.mk" 32.include "../../devel/libgetopt/buildlink3.mk"
31.include "../../multimedia/libogg/buildlink3.mk" 33.include "../../multimedia/libogg/buildlink3.mk"
32 34
33.include "../../mk/oss.buildlink3.mk" 35.include "../../mk/oss.buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/audio/speex/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/speex/PLIST 2004/09/22 08:09:17 1.7
+++ pkgsrc/audio/speex/PLIST 2008/11/08 21:06:46 1.8
@@ -1,21 +1,25 @@ @@ -1,21 +1,25 @@
1@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:17 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.8 2008/11/08 21:06:46 bjs Exp $
2bin/speexdec 2bin/speexdec
3bin/speexenc 3bin/speexenc
4include/speex.h 
5include/speex/speex.h 4include/speex/speex.h
6include/speex/speex_bits.h 5include/speex/speex_bits.h
 6include/speex/speex_buffer.h
7include/speex/speex_callbacks.h 7include/speex/speex_callbacks.h
 8include/speex/speex_config_types.h
 9include/speex/speex_echo.h
8include/speex/speex_header.h 10include/speex/speex_header.h
 11include/speex/speex_jitter.h
 12include/speex/speex_preprocess.h
 13include/speex/speex_resampler.h
9include/speex/speex_stereo.h 14include/speex/speex_stereo.h
10include/speex_bits.h 15include/speex/speex_types.h
11include/speex_callbacks.h 
12include/speex_header.h 
13include/speex_stereo.h 
14lib/libspeex.la 16lib/libspeex.la
 17lib/libspeexdsp.la
15lib/pkgconfig/speex.pc 18lib/pkgconfig/speex.pc
 19lib/pkgconfig/speexdsp.pc
16man/man1/speexdec.1 20man/man1/speexdec.1
17man/man1/speexenc.1 21man/man1/speexenc.1
18share/aclocal/speex.m4 22share/aclocal/speex.m4
19share/doc/speex-${PKGVERSION}/manual.pdf 23share/doc/speex/manual.pdf
20@dirrm share/doc/speex-${PKGVERSION} 24@dirrm share/doc/speex
21@dirrm include/speex 25@dirrm include/speex
cvs diff -r1.10 -r1.11 pkgsrc/audio/speex/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/audio/speex/buildlink3.mk 2006/07/08 23:10:37 1.10
+++ pkgsrc/audio/speex/buildlink3.mk 2008/11/08 21:06:46 1.11
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2008/11/08 21:06:46 bjs Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+ 4SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= speex 7BUILDLINK_DEPENDS+= speex
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeex} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nspeex}
11BUILDLINK_PACKAGES+= speex 11BUILDLINK_PACKAGES+= speex
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex
13 13
14.if !empty(SPEEX_BUILDLINK3_MK:M+) 14.if !empty(SPEEX_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.speex+= speex>=1.0.4 15BUILDLINK_API_DEPENDS.speex+= speex>=1.2rc1
16BUILDLINK_ABI_DEPENDS.speex+= speex>=1.0.4nb1 
17BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex 16BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
18.endif # SPEEX_BUILDLINK3_MK 17.endif # SPEEX_BUILDLINK3_MK
19 18
20.include "../../multimedia/libogg/buildlink3.mk" 19.include "../../multimedia/libogg/buildlink3.mk"
21 20
22BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 21BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.11 -r1.12 pkgsrc/audio/speex/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/speex/distinfo 2008/04/29 20:22:43 1.11
+++ pkgsrc/audio/speex/distinfo 2008/11/08 21:06:46 1.12
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
1$NetBSD: distinfo,v 1.11 2008/04/29 20:22:43 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2008/11/08 21:06:46 bjs Exp $
2 2
3SHA1 (speex-1.0.5.tar.gz) = a8f34f80e5f84a47aee7e70088632d4958fe75fd 3SHA1 (speex-1.2rc1.tar.gz) = 52daa72572e844e5165315e208da539b2a55c5eb
4RMD160 (speex-1.0.5.tar.gz) = 6ceed29438912647ef1d2d7299822fdaaf5509f9 4RMD160 (speex-1.2rc1.tar.gz) = 6f4a11ef910b0db9b820826bcac3da1b79cad3a1
5Size (speex-1.0.5.tar.gz) = 546872 bytes 5Size (speex-1.2rc1.tar.gz) = 1061882 bytes
6SHA1 (patch-aa) = 675bbd2696852002d73fc778a3c1125435eb0fc6 6SHA1 (patch-ab) = f597b1bcc4444e025e7029a6fc17948a73d5980b
7SHA1 (patch-ab) = b88dfafc1464aed7c5f38f39a270d16338335418 
8SHA1 (patch-ac) = 9167258134683ee6172455532ff1ae9aa95d9868 
File Deleted: pkgsrc/audio/speex/patches/Attic/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/audio/speex/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/speex/patches/patch-ab 2006/03/11 03:14:43 1.4
+++ pkgsrc/audio/speex/patches/patch-ab 2008/11/08 21:06:46 1.5
@@ -1,25 +1,18 @@ @@ -1,25 +1,18 @@
1$NetBSD: patch-ab,v 1.4 2006/03/11 03:14:43 reed Exp $ 1$NetBSD: patch-ab,v 1.5 2008/11/08 21:06:46 bjs Exp $
2 2
3--- src/Makefile.in.orig 2004-07-15 00:25:20.000000000 -0700 3--- src/Makefile.in.orig 2008-07-20 22:17:20.000000000 -0400
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -183,7 +183,7 @@ install_sh = @install_sh@ 5@@ -224,11 +224,11 @@ include_HEADERS =
6 libdir = @libdir@ 
7 libexecdir = @libexecdir@ 
8 localstatedir = @localstatedir@ 
9-mandir = $(prefix)/share/man 
10+mandir = @mandir@ 
11 mkdir_p = @mkdir_p@ 
12 oldincludedir = @oldincludedir@ 
13 prefix = @prefix@ 
14@@ -199,9 +199,9 @@ EXTRA_DIST = $(man_MANS) getopt_win.h ge 
15 include_HEADERS =  
16 noinst_HEADERS = wav_io.h 6 noinst_HEADERS = wav_io.h
17 speexenc_SOURCES = speexenc.c wav_io.c 7 speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
18-speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) 8 speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
19+speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO) 9- $(OGG_LIBS) @FFT_LIBS@
 10+ $(OGG_LIBS) @FFT_LIBS@ $(LIBOSSAUDIO)
 11
20 speexdec_SOURCES = speexdec.c wav_io.c 12 speexdec_SOURCES = speexdec.c wav_io.c
21-speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) 13 speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
22+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO) 14- $(OGG_LIBS) @FFT_LIBS@
 15+ $(OGG_LIBS) @FFT_LIBS@ $(LIBOSSAUDIO)
 16
23 all: all-am 17 all: all-am
24  18
25 .SUFFIXES: 
File Deleted: pkgsrc/audio/speex/patches/Attic/patch-ac