Update to 1.0.4:

* Headers are now in ${PREFIX}/include/speex/ (but a copy is still
  in ${PREFIX}/include for compat reasons).
* Pseudo-gapless playback (i.e. playback has the same number of
  samples)
* Fixed a potential bug (unconfirmed) that might cause a segfault
  in special circumstances.

Also includes a shlib major bump, so update DEPENDS in buildlink3.mk.

5 files changed, 38 insertions, 29 deletions

diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 8eb13661fdb..4fa2ea2a543 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/23 15:48:47 wiz Exp $
 #
 
-DISTNAME=	speex-1.0.3
+DISTNAME=	speex-1.0.4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speex.org/download/
 
@@ -12,12 +12,14 @@ COMMENT=	Open-source, patent-free voice codec
 USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
+PKGCONFIG_OVERRIDE=	speex.pc.in
 
 # previous versions of the package were called Speex
 CONFLICTS=	Speex-[0-9]*
 
 CONFIGURE_ARGS+=	--with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
 
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/speex/PLIST b/audio/speex/PLIST
index 871aaea6087..46d050f33f2 100644
--- a/audio/speex/PLIST
+++ b/audio/speex/PLIST
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/08 19:28:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/07/23 15:48:47 wiz Exp $
 bin/speexdec
 bin/speexenc
 include/speex.h
+include/speex/speex.h
+include/speex/speex_bits.h
+include/speex/speex_callbacks.h
+include/speex/speex_header.h
+include/speex/speex_stereo.h
 include/speex_bits.h
 include/speex_callbacks.h
 include/speex_header.h
@@ -9,9 +14,12 @@ include/speex_stereo.h
 lib/libspeex.a
 lib/libspeex.la
 lib/libspeex.so
-lib/libspeex.so.2
-lib/libspeex.so.2.2
+lib/libspeex.so.3
+lib/libspeex.so.3.0
+lib/pkgconfig/speex.pc
 man/man1/speexdec.1
 man/man1/speexenc.1
+share/aclocal/speex.m4
 share/doc/speex-${PKGVERSION}/manual.pdf
 @dirrm share/doc/speex-${PKGVERSION}
+@dirrm include/speex
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 19cb4afa218..c2e1e2b1405 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/07/23 15:48:47 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPEEX_BUILDLINK3_MK:=	${SPEEX_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspeex}
 BUILDLINK_PACKAGES+=	speex
 
 .if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.speex+=	speex>=1.0.2nb1
+BUILDLINK_DEPENDS.speex+=	speex>=1.0.4
 BUILDLINK_PKGSRCDIR.speex?=	../../audio/speex
 .endif	# SPEEX_BUILDLINK3_MK
 
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
index 2a13c4499a7..c4886506be4 100644
--- a/audio/speex/distinfo
+++ b/audio/speex/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/12/08 19:28:49 wiz Exp $
+$NetBSD: distinfo,v 1.6 2004/07/23 15:48:47 wiz Exp $
 
-SHA1 (speex-1.0.3.tar.gz) = d09afb6578efab6fe7b1ff751eec3cc4d4125ec3
-Size (speex-1.0.3.tar.gz) = 398002 bytes
-SHA1 (patch-ab) = 2dc0e651926233e47aea62f37ed372f8f5f0df17
+SHA1 (speex-1.0.4.tar.gz) = 3684bfcaf62ecbc47a51637e51b62fd4ab780c23
+Size (speex-1.0.4.tar.gz) = 546214 bytes
+SHA1 (patch-ab) = f81d9bceb76acc7deb017140d39a88234e130c10
diff --git a/audio/speex/patches/patch-ab b/audio/speex/patches/patch-ab
index d4dceb12e3d..b7e51c06357 100644
--- a/audio/speex/patches/patch-ab
+++ b/audio/speex/patches/patch-ab
@@ -1,26 +1,25 @@
-$NetBSD: patch-ab,v 1.2 2003/06/05 13:18:11 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2004/07/23 15:48:47 wiz Exp $
 
---- src/Makefile.in.orig	Wed Jun  4 23:22:46 2003
+--- src/Makefile.in.orig	2004-07-15 09:25:20.000000000 +0200
 +++ src/Makefile.in
-@@ -88,7 +88,7 @@ src = @src@
- 
- INCLUDES = -I$(top_srcdir)/libspeex $(OGG_INCLUDES)
- 
+@@ -183,7 +183,7 @@ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
 -mandir = $(prefix)/share/man
 +mandir = $(prefix)/man
- man_MANS = speexenc.1 speexdec.1
- 
- EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h
-@@ -99,10 +99,10 @@ noinst_HEADERS = wav_io.h
- bin_PROGRAMS = speexenc speexdec
- 
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+@@ -199,9 +199,9 @@ EXTRA_DIST = $(man_MANS) getopt_win.h ge
+ 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_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_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}
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- bin_PROGRAMS =  speexenc$(EXEEXT) speexdec$(EXEEXT)
++speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) $(LIBOSSAUDIO)
+ all: all-am
+ 
+ .SUFFIXES: