Changes 1.0.17:

* Add sndfile.hh C++ wrapper.
* Update Win32 MinGW build instructions.
* Minor bug fixes and cleanups.

7 files changed, 34 insertions, 19 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index e9ba1a410b4..0e845481928 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2006/04/30 17:29:29 adam Exp $
+# $NetBSD: Makefile,v 1.39 2006/09/01 06:02:23 adam Exp $
 
-DISTNAME=	libsndfile-1.0.16
+DISTNAME=	libsndfile-1.0.17
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
index 45cbf8d9ceb..a405db3585e 100644
--- a/audio/libsndfile/PLIST
+++ b/audio/libsndfile/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2005/09/30 13:26:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/09/01 06:02:23 adam Exp $
 bin/sndfile-convert
 bin/sndfile-info
 bin/sndfile-play
 bin/sndfile-regtest
 include/sndfile.h
+include/sndfile.hh
 lib/libsndfile.la
 lib/pkgconfig/sndfile.pc
 man/man1/sndfile-convert.1
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 37775c57bbe..acbac8a1d08 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.20 2006/04/30 17:29:29 adam Exp $
+$NetBSD: distinfo,v 1.21 2006/09/01 06:02:23 adam Exp $
 
-SHA1 (libsndfile-1.0.16.tar.gz) = b844603fe5106459663123630dc42abbdd06e215
-RMD160 (libsndfile-1.0.16.tar.gz) = c77c33284f0083e0375b918edea2cc13a99774f6
-Size (libsndfile-1.0.16.tar.gz) = 857117 bytes
-SHA1 (patch-aa) = 129875d506665a386f97e6fddc04ab41f372208b
+SHA1 (libsndfile-1.0.17.tar.gz) = 2f66798d596a15491fbd1191ded8125ed71ef411
+RMD160 (libsndfile-1.0.17.tar.gz) = ae93822a4c587dcdd7c70d043d2a38ed2fe3a188
+Size (libsndfile-1.0.17.tar.gz) = 819456 bytes
+SHA1 (patch-aa) = a3bb33cc28c10c9aa23a0b066339a512dbd7b0e2
 SHA1 (patch-ab) = 007a93229bc8cbcb1b27e6223e8c10e8a2e3c6eb
-SHA1 (patch-ac) = 1faf09c8760981316c562dd2172b8e02546cc9fe
-SHA1 (patch-ad) = 444f55c4fd03e1bd4620aefd168e974a2783dcf3
+SHA1 (patch-ac) = 7d49a0da2dfa9470d188873133526e8ad851c9a7
+SHA1 (patch-ad) = b730de6bb0716bece5f83c3100f9fc0f8eb2ae7d
 SHA1 (patch-ae) = 628700514d3d2e6e12abb182c697311a233c1bd9
 SHA1 (patch-af) = 9ac0dd446a2f24c2d39e20063489a3b778fcda36
 SHA1 (patch-ag) = 10d0fcda9377fc6afa2dce9e4782f49889a4f4a3
+SHA1 (patch-ah) = 8c936316ca1191f8893579a562ff705c8dde6f92
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
index 664a3792bd9..59771748172 100644
--- a/audio/libsndfile/patches/patch-aa
+++ b/audio/libsndfile/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2006/04/30 17:29:29 adam Exp $
+$NetBSD: patch-aa,v 1.13 2006/09/01 06:02:23 adam Exp $
 
---- src/Makefile.in.orig	2006-04-30 04:48:33.000000000 +0200
+--- src/Makefile.in.orig	2006-08-31 12:55:38.000000000 +0200
 +++ src/Makefile.in
-@@ -838,7 +838,7 @@ cygsndfile.def: create_symbols_file.py
+@@ -864,7 +864,7 @@ cygsndfile.def: create_symbols_file.py
  	./create_symbols_file.py cygwin $(VERSION) > cygsndfile.def
  
  # Fake dependancy to force the creation of these files.
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
index 170c7e83f4f..9d2378d4520 100644
--- a/audio/libsndfile/patches/patch-ac
+++ b/audio/libsndfile/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2005/09/30 13:26:02 adam Exp $
+$NetBSD: patch-ac,v 1.8 2006/09/01 06:02:23 adam Exp $
 
---- examples/sndfile-play.c.orig	2005-09-04 00:11:38.000000000 +0000
+--- examples/sndfile-play.c.orig	2006-08-31 11:22:07.000000000 +0200
 +++ examples/sndfile-play.c
 @@ -34,16 +34,21 @@
  	#include <sys/time.h>
@@ -37,7 +37,7 @@ $NetBSD: patch-ac,v 1.7 2005/09/30 13:26:02 adam Exp $
  
 @@ -408,7 +413,7 @@ static int
  linux_open_dsp_device (int channels, int srate)
- {	int fd, stereo, temp, error ;
+ {	int fd, stereo, fmt ;
  
 -	if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 &&
 +	if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1 &&
diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad
index d767c0a9868..b6dd33c1c27 100644
--- a/audio/libsndfile/patches/patch-ad
+++ b/audio/libsndfile/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2006/04/30 17:29:29 adam Exp $
+$NetBSD: patch-ad,v 1.10 2006/09/01 06:02:23 adam Exp $
 
---- examples/Makefile.in.orig	2006-04-30 04:48:27.000000000 +0200
+--- examples/Makefile.in.orig	2006-08-31 12:55:32.000000000 +0200
 +++ examples/Makefile.in
-@@ -235,7 +235,7 @@ INCLUDES = -I$(srcdir)/$(SNDFILEDIR) $(O
+@@ -238,7 +238,7 @@ INCLUDES = -I$(srcdir)/$(SNDFILEDIR) $(O
  sndfile_info_SOURCES = sndfile-info.c 
  sndfile_info_LDADD = $(SNDFILEDIR)/libsndfile.la
  sndfile_play_SOURCES = sndfile-play.c 
diff --git a/audio/libsndfile/patches/patch-ah b/audio/libsndfile/patches/patch-ah
new file mode 100644
index 00000000000..1c5d346718f
--- /dev/null
+++ b/audio/libsndfile/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2006/09/01 06:02:23 adam Exp $
+
+--- Makefile.in.orig	2006-09-01 07:54:23.000000000 +0200
++++ Makefile.in
+@@ -209,7 +209,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = man doc Win32 Octave src examples regtest tests
++SUBDIRS = man doc Win32 Octave src examples regtest
+ DIST_SUBDIRS = $(SUBDIRS)
+ EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
+ 			sndfile.pc.in Mingw-make-dist.sh