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
--- 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,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2008/04/29 20:22:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2008/11/08 21:06:46 bjs Exp $
#
-DISTNAME= speex-1.0.5
-PKGREVISION= 1
+DISTNAME= speex-1.2rc1
CATEGORIES= audio
MASTER_SITES= http://downloads.us.xiph.org/releases/speex/
@@ -15,17 +14,20 @@
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
CONFLICTS= Speex-[0-9]*
-CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
+CONFIGURE_ARGS+= --with-ogg-dir=${BUILDLINK_PREFIX.libogg:Q}
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE:Q}
BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
+
+.include "options.mk"
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
--- 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 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/11/08 21:06:46 bjs Exp $
bin/speexdec
bin/speexenc
-include/speex.h
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_bits.h
-include/speex_callbacks.h
-include/speex_header.h
-include/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
-share/doc/speex-${PKGVERSION}/manual.pdf
-@dirrm share/doc/speex-${PKGVERSION}
+share/doc/speex/manual.pdf
+@dirrm share/doc/speex
@dirrm include/speex
--- 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,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2008/11/08 21:06:46 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SPEEX_BUILDLINK3_MK:= ${SPEEX_BUILDLINK3_MK}+
@@ -12,8 +12,7 @@
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}speex
.if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.speex+= speex>=1.0.4
-BUILDLINK_ABI_DEPENDS.speex+= speex>=1.0.4nb1
+BUILDLINK_API_DEPENDS.speex+= speex>=1.2rc1
BUILDLINK_PKGSRCDIR.speex?= ../../audio/speex
.endif # SPEEX_BUILDLINK3_MK
--- 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 @@
-$NetBSD: distinfo,v 1.11 2008/04/29 20:22:43 wiz Exp $
+$NetBSD: distinfo,v 1.12 2008/11/08 21:06:46 bjs Exp $
-SHA1 (speex-1.0.5.tar.gz) = a8f34f80e5f84a47aee7e70088632d4958fe75fd
+SHA1 (speex-1.2rc1.tar.gz) = 52daa72572e844e5165315e208da539b2a55c5eb
-RMD160 (speex-1.0.5.tar.gz) = 6ceed29438912647ef1d2d7299822fdaaf5509f9
+RMD160 (speex-1.2rc1.tar.gz) = 6f4a11ef910b0db9b820826bcac3da1b79cad3a1
-Size (speex-1.0.5.tar.gz) = 546872 bytes
+Size (speex-1.2rc1.tar.gz) = 1061882 bytes
-SHA1 (patch-aa) = 675bbd2696852002d73fc778a3c1125435eb0fc6
+SHA1 (patch-ab) = f597b1bcc4444e025e7029a6fc17948a73d5980b
-SHA1 (patch-ab) = b88dfafc1464aed7c5f38f39a270d16338335418
-SHA1 (patch-ac) = 9167258134683ee6172455532ff1ae9aa95d9868
--- 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 @@
-$NetBSD: patch-ab,v 1.4 2006/03/11 03:14:43 reed Exp $
+$NetBSD: patch-ab,v 1.5 2008/11/08 21:06:46 bjs Exp $
---- src/Makefile.in.orig 2004-07-15 00:25:20.000000000 -0700
+--- src/Makefile.in.orig 2008-07-20 22:17:20.000000000 -0400
+++ src/Makefile.in
-@@ -183,7 +183,7 @@ install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
--mandir = $(prefix)/share/man
-+mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
-@@ -199,9 +199,9 @@ EXTRA_DIST = $(man_MANS) getopt_win.h ge
- include_HEADERS =
+@@ -224,11 +224,11 @@ include_HEADERS =
noinst_HEADERS = wav_io.h
- speexenc_SOURCES = speexenc.c wav_io.c
--speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
-+speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO)
+ 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)
+
speexdec_SOURCES = speexdec.c wav_io.c
--speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
-+speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO)
+ speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
+- $(OGG_LIBS) @FFT_LIBS@
++ $(OGG_LIBS) @FFT_LIBS@ $(LIBOSSAUDIO)
+
all: all-am
- .SUFFIXES: