Changes 1.0.11:

* Add SD2 file support
* Reading of loop data in WAV and AIFF
* Minor bug fixes

8 files changed, 38 insertions, 39 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 4ec1f49d8f1..08293e4b3c8 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: Makefile,v 1.25 2004/11/19 12:15:14 adam Exp $
 
-DISTNAME=	libsndfile-1.0.10
-PKGREVISION=	1
+DISTNAME=	libsndfile-1.0.11
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 5f6d29a7c50..7b47542814c 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2004/06/28 08:14:03 adam Exp $
+$NetBSD: distinfo,v 1.14 2004/11/19 12:15:14 adam Exp $
 
-SHA1 (libsndfile-1.0.10.tar.gz) = 6bbff76d28b4bcd8fe8d4cf97e7825c7ef435682
-Size (libsndfile-1.0.10.tar.gz) = 749365 bytes
-SHA1 (patch-aa) = 6d0835ab1a7e6f4ae145f3f68f150b64423cccb6
-SHA1 (patch-ab) = 0191a2b09f74f7d1b91ae2b04e1ee1c19914f2b9
-SHA1 (patch-ac) = 46d6bc9c28aa13087b8762ac1df18f9d7fe5c167
-SHA1 (patch-ad) = be4def52223e5089f9810d48b7523923a7f78a78
-SHA1 (patch-ae) = 0df24e9ce0d6d784a64cbd172fd107ea2f4d7611
-SHA1 (patch-af) = 65b8f793548cdeb5c329d76c895374878ccc3ecf
+SHA1 (libsndfile-1.0.11.tar.gz) = 16372a7814530178a2642bd22f203641e0392ebb
+Size (libsndfile-1.0.11.tar.gz) = 816107 bytes
+SHA1 (patch-aa) = a0c533fa6631de205f824e8636d95f236488239e
+SHA1 (patch-ab) = 09a8293a668f7497ca58945963a981542e401ff3
+SHA1 (patch-ac) = a4ff411abc342a357bd7cf6a8fe17e7829efc624
+SHA1 (patch-ad) = a71110072645dbaa1086b0ad024fc362d24990f6
+SHA1 (patch-ae) = 5a161296951242bbf0de12e54b84e376aaa46e7e
+SHA1 (patch-af) = 830aa60311291464d370614156a20ee9c4c8cd6b
 SHA1 (patch-ag) = 10d0fcda9377fc6afa2dce9e4782f49889a4f4a3
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
index 3ce913cc7f2..f1506e7f8de 100644
--- a/audio/libsndfile/patches/patch-aa
+++ b/audio/libsndfile/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/06/28 08:14:03 adam Exp $
+$NetBSD: patch-aa,v 1.8 2004/11/19 12:15:14 adam Exp $
 
---- src/Makefile.in.orig	2004-06-16 10:18:32.000000000 +0000
+--- src/Makefile.in.orig	2004-11-15 10:53:04.000000000 +0000
 +++ src/Makefile.in
-@@ -867,7 +867,7 @@ libsndfile.def: create_symbols_file.py
+@@ -881,7 +881,7 @@ libsndfile.def: create_symbols_file.py
  	./create_symbols_file.py win32 $(VERSION) > libsndfile.def
  
  # Fake dependancy to force the creation of these files.
diff --git a/audio/libsndfile/patches/patch-ab b/audio/libsndfile/patches/patch-ab
index bf721a06b25..fb727ed933f 100644
--- a/audio/libsndfile/patches/patch-ab
+++ b/audio/libsndfile/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2004/06/28 08:14:03 adam Exp $
+$NetBSD: patch-ab,v 1.5 2004/11/19 12:15:14 adam Exp $
 
---- src/common.h.orig	2004-06-16 10:17:04.000000000 +0000
+--- src/common.h.orig	2004-11-14 19:56:44.000000000 +0000
 +++ src/common.h
-@@ -118,7 +118,7 @@ typedef struct
- {	unsigned int	version ;	/* version of the PEAK chunk */
+@@ -137,7 +137,7 @@ typedef struct
  	unsigned int	timestamp ;	/* secs since 1/1/1970  */
  #if HAVE_FLEXIBLE_ARRAY
--	PEAK_POS		peaks [] ;	/* the per channel peak info */
-+	PEAK_POS		*peaks ;	/* the per channel peak info */
+ 	/* the per channel peak info */
+-	PEAK_POS		peaks [] ;
++	PEAK_POS		*peaks ;
  #else
- 	PEAK_POS		peaks [1] ;	/* the per channel peak info */
- #endif
+ 	/*
+ 	** This is not ISO compliant C. It works on some compilers which
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
index 50533bb3cc7..962c4fca0ce 100644
--- a/audio/libsndfile/patches/patch-ac
+++ b/audio/libsndfile/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
+$NetBSD: patch-ac,v 1.6 2004/11/19 12:15:14 adam Exp $
 
---- examples/sndfile-play.c.orig	2004-06-16 10:17:04.000000000 +0000
+--- examples/sndfile-play.c.orig	2004-11-14 19:57:17.000000000 +0000
 +++ examples/sndfile-play.c
 @@ -34,16 +34,21 @@
  	#include <sys/time.h>
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
  	#include <fcntl.h>
  	#include <sys/ioctl.h>
  	#include <sys/audioio.h>
-@@ -326,7 +331,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
+@@ -324,7 +329,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
  **	Linux/OSS functions for playing a sound.
  */
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
  
  static	int	linux_open_dsp_device (int channels, int srate) ;
  
-@@ -389,7 +394,7 @@ static int
+@@ -387,7 +392,7 @@ static int
  linux_open_dsp_device (int channels, int srate)
  {	int fd, stereo, temp, error ;
  
@@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
  		(fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
  	{	perror ("linux_open_dsp_device : open ") ;
  		exit (1) ;
-@@ -762,7 +767,8 @@ win32_play (int argc, char *argv [])
+@@ -798,7 +803,8 @@ win32_play (int argc, char *argv [])
  **	Solaris.
  */
  
@@ -54,7 +54,7 @@ $NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
  
  static void
  solaris_play (int argc, char *argv [])
-@@ -869,7 +875,7 @@ main (int argc, char *argv [])
+@@ -905,7 +911,7 @@ main (int argc, char *argv [])
  		return 1 ;
  		} ;
  
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
  	#if HAVE_ALSA_ASOUNDLIB_H
  		if (access ("/proc/asound/cards", R_OK) == 0)
  			alsa_play (argc, argv) ;
-@@ -878,7 +884,8 @@ main (int argc, char *argv [])
+@@ -914,7 +920,8 @@ main (int argc, char *argv [])
  		linux_play (argc, argv) ;
  #elif (defined (__MACH__) && defined (__APPLE__))
  	macosx_play (argc, argv) ;
diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad
index 1153bd3b9a0..9305f11d4bb 100644
--- a/audio/libsndfile/patches/patch-ad
+++ b/audio/libsndfile/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2004/06/28 08:14:03 adam Exp $
+$NetBSD: patch-ad,v 1.6 2004/11/19 12:15:14 adam Exp $
 
---- examples/Makefile.in.orig	2004-06-16 10:18:29.000000000 +0000
+--- examples/Makefile.in.orig	2004-11-15 10:53:01.000000000 +0000
 +++ examples/Makefile.in
-@@ -170,7 +170,7 @@ sndfile_info_SOURCES = sndfile-info.c 
+@@ -168,7 +168,7 @@ 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-ae b/audio/libsndfile/patches/patch-ae
index 3ea70ca23b4..e120226ad0c 100644
--- a/audio/libsndfile/patches/patch-ae
+++ b/audio/libsndfile/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2004/06/28 08:14:03 adam Exp $
+$NetBSD: patch-ae,v 1.3 2004/11/19 12:15:14 adam Exp $
 
---- src/ima_adpcm.c.orig	2004-06-16 10:17:04.000000000 +0000
+--- src/ima_adpcm.c.orig	2004-11-19 13:05:19.000000000 +0000
 +++ src/ima_adpcm.c
 @@ -37,7 +37,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
  	unsigned char	*block ;
@@ -9,5 +9,5 @@ $NetBSD: patch-ae,v 1.2 2004/06/28 08:14:03 adam Exp $
 -	unsigned short	data	[] ; /* ISO C99 struct flexible array. */
 +	unsigned short	*data ; /* ISO C99 struct flexible array. */
  #else
- 	unsigned short	data	[1] ; /* This is a hack and might not work. */
+ 	unsigned short	data	[0] ; /* This is a hack and might not work. */
  #endif
diff --git a/audio/libsndfile/patches/patch-af b/audio/libsndfile/patches/patch-af
index 7b1f9896fb8..e7ff46ab404 100644
--- a/audio/libsndfile/patches/patch-af
+++ b/audio/libsndfile/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2004/06/28 08:14:03 adam Exp $
+$NetBSD: patch-af,v 1.3 2004/11/19 12:15:14 adam Exp $
 
---- src/ms_adpcm.c.orig	2004-06-16 10:17:04.000000000 +0000
+--- src/ms_adpcm.c.orig	2004-10-17 00:46:34.000000000 +0000
 +++ src/ms_adpcm.c
 @@ -44,7 +44,7 @@ typedef struct
  	short			*samples ;
@@ -9,5 +9,5 @@ $NetBSD: patch-af,v 1.2 2004/06/28 08:14:03 adam Exp $
 -	unsigned short	dummydata [] ; /* ISO C99 struct flexible array. */
 +	unsigned short	*dummydata ; /* ISO C99 struct flexible array. */
  #else
- 	unsigned short	dummydata [1] ; /* This is a hack an might not work. */
+ 	unsigned short	dummydata [0] ; /* This is a hack an might not work. */
  #endif