Changes 1.0.10:

* Minor bug fixes
* Fix support for Win32 MinGW compiler

10 files changed, 80 insertions, 65 deletions

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 68d2593eb9d..2e5c0522bd1 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2004/05/31 16:47:47 minskim Exp $
-#
+# $NetBSD: Makefile,v 1.23 2004/06/28 08:14:03 adam Exp $
 
-DISTNAME=	libsndfile-1.0.9
+DISTNAME=	libsndfile-1.0.10
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
@@ -16,7 +15,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	sndfile.pc.in
 
-
 # This package compiles with gcc2, but its configure script doesn't know that
 CONFIGURE_ENV+=		ac_cv_c_struct_hack=yes
 # Avoid an ICE in gcc2 on sparc64
diff --git a/audio/libsndfile/PLIST b/audio/libsndfile/PLIST
index 7e80ac282e8..97760b4eeed 100644
--- a/audio/libsndfile/PLIST
+++ b/audio/libsndfile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/04/02 10:13:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/06/28 08:14:03 adam Exp $
 bin/sndfile-convert
 bin/sndfile-info
 bin/sndfile-play
@@ -7,14 +7,31 @@ lib/libsndfile.a
 lib/libsndfile.la
 lib/libsndfile.so
 lib/libsndfile.so.1
-lib/libsndfile.so.1.9
+lib/libsndfile.so.1.10
 lib/pkgconfig/sndfile.pc
 man/man1/sndfile-convert.1
 man/man1/sndfile-info.1
 man/man1/sndfile-play.1
+share/doc/libsndfile1-dev/html/FAQ.html
+share/doc/libsndfile1-dev/html/api.html
+share/doc/libsndfile1-dev/html/bugs.html
+share/doc/libsndfile1-dev/html/command.html
+share/doc/libsndfile1-dev/html/dither.html
+share/doc/libsndfile1-dev/html/embedded_files.html
+share/doc/libsndfile1-dev/html/index.html
+share/doc/libsndfile1-dev/html/libsndfile.css
+share/doc/libsndfile1-dev/html/libsndfile.jpg
+share/doc/libsndfile1-dev/html/lists.html
+share/doc/libsndfile1-dev/html/new_file_type.HOWTO
+share/doc/libsndfile1-dev/html/octave.html
+share/doc/libsndfile1-dev/html/pkgconfig.html
+share/doc/libsndfile1-dev/html/sndfile_info.html
+share/doc/libsndfile1-dev/html/win32.html
 share/octave/site/m/sndfile_load.m
 share/octave/site/m/sndfile_play.m
 share/octave/site/m/sndfile_save.m
+@dirrm share/doc/libsndfile1-dev/html
+@dirrm share/doc/libsndfile1-dev
 @dirrm share/octave/site/m
 @dirrm share/octave/site
 @dirrm share/octave
diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 3a520b51bb4..5f6d29a7c50 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2004/04/02 10:13:43 adam Exp $
+$NetBSD: distinfo,v 1.13 2004/06/28 08:14:03 adam Exp $
 
-SHA1 (libsndfile-1.0.9.tar.gz) = 05aabce19b73cc7a05f8d9cfcb21d6f686c4ed9c
-Size (libsndfile-1.0.9.tar.gz) = 776011 bytes
-SHA1 (patch-aa) = 063d610cbf031b49dd7befa84c22b6f9ab0a21f3
-SHA1 (patch-ab) = 249e605fb37a6b29e4cf7ba4809901e4aab6b584
-SHA1 (patch-ac) = 61bde4104e38ad506998264a9b8218de35447150
-SHA1 (patch-ad) = 75b5243c963bf03b7a979f57b93d6a3de2da669c
-SHA1 (patch-ae) = fb5a03eb15212bdd28ce395e4bd382bc885ce093
-SHA1 (patch-af) = 229534b39e182da2ae1ec54f94c7b837ddf3ba58
-SHA1 (patch-ag) = d8e953da32ac0eb8c700f879cd491b1b977a216d
+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 (patch-ag) = 10d0fcda9377fc6afa2dce9e4782f49889a4f4a3
diff --git a/audio/libsndfile/patches/patch-aa b/audio/libsndfile/patches/patch-aa
index f04f9f73b10..3ce913cc7f2 100644
--- a/audio/libsndfile/patches/patch-aa
+++ b/audio/libsndfile/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/04/02 10:13:43 adam Exp $
+$NetBSD: patch-aa,v 1.7 2004/06/28 08:14:03 adam Exp $
 
---- src/Makefile.in.orig	2004-03-30 11:25:19.000000000 +0000
+--- src/Makefile.in.orig	2004-06-16 10:18:32.000000000 +0000
 +++ src/Makefile.in
-@@ -861,7 +861,7 @@ libsndfile.def: create_symbols_file.py
+@@ -867,7 +867,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 fdd13738cc0..bf721a06b25 100644
--- a/audio/libsndfile/patches/patch-ab
+++ b/audio/libsndfile/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2004/04/02 09:37:56 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2004/06/28 08:14:03 adam Exp $
 
---- src/common.h.orig	2004-03-09 14:02:41.000000000 +0100
+--- src/common.h.orig	2004-06-16 10:17:04.000000000 +0000
 +++ src/common.h
-@@ -117,7 +117,7 @@ typedef struct
- typedef struct
+@@ -118,7 +118,7 @@ typedef struct
  {	unsigned int	version ;	/* version of the PEAK chunk */
  	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 */
- } PEAK_CHUNK ;
- 
- typedef struct
+ #else
+ 	PEAK_POS		peaks [1] ;	/* the per channel peak info */
+ #endif
diff --git a/audio/libsndfile/patches/patch-ac b/audio/libsndfile/patches/patch-ac
index ea1a6e96089..50533bb3cc7 100644
--- a/audio/libsndfile/patches/patch-ac
+++ b/audio/libsndfile/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
+$NetBSD: patch-ac,v 1.5 2004/06/28 08:14:03 adam Exp $
 
---- examples/sndfile-play.c.orig	2004-03-17 09:39:29.000000000 +0000
+--- examples/sndfile-play.c.orig	2004-06-16 10:17:04.000000000 +0000
 +++ examples/sndfile-play.c
 @@ -34,16 +34,21 @@
  	#include <sys/time.h>
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
  	#include <fcntl.h>
  	#include <sys/ioctl.h>
  	#include <sys/audioio.h>
-@@ -328,7 +333,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
+@@ -326,7 +331,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f
  **	Linux/OSS functions for playing a sound.
  */
  
@@ -35,16 +35,16 @@ $NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
  
  static	int	linux_open_dsp_device (int channels, int srate) ;
  
-@@ -391,7 +396,7 @@ static int
+@@ -389,7 +394,7 @@ static int
  linux_open_dsp_device (int channels, int srate)
  {	int fd, stereo, temp, error ;
  
 -	if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 &&
 +	if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1 &&
  		(fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1)
- 	{	perror("linux_open_dsp_device : open ") ;
+ 	{	perror ("linux_open_dsp_device : open ") ;
  		exit (1) ;
-@@ -757,7 +762,8 @@ win32_play (int argc, char *argv [])
+@@ -762,7 +767,8 @@ win32_play (int argc, char *argv [])
  **	Solaris.
  */
  
@@ -54,7 +54,7 @@ $NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
  
  static void
  solaris_play (int argc, char *argv [])
-@@ -864,7 +870,7 @@ main (int argc, char *argv [])
+@@ -869,7 +875,7 @@ main (int argc, char *argv [])
  		return 1 ;
  		} ;
  
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
  	#if HAVE_ALSA_ASOUNDLIB_H
  		if (access ("/proc/asound/cards", R_OK) == 0)
  			alsa_play (argc, argv) ;
-@@ -873,7 +879,8 @@ main (int argc, char *argv [])
+@@ -878,7 +884,8 @@ main (int argc, char *argv [])
  		linux_play (argc, argv) ;
  #elif (defined (__MACH__) && defined (__APPLE__))
  	macosx_play (argc, argv) ;
@@ -71,5 +71,5 @@ $NetBSD: patch-ac,v 1.4 2004/04/02 10:13:43 adam Exp $
 +#elif (defined (sun) && defined (unix)) || \
 +      (defined (__NetBSD__) && !defined(USE_OSS))
  	solaris_play (argc, argv) ;
- #elif WIN32_WITH_MMREG_H
+ #elif (OS_IS_WIN32 == 1)
  	win32_play (argc, argv) ;
diff --git a/audio/libsndfile/patches/patch-ad b/audio/libsndfile/patches/patch-ad
index ea06d32393c..1153bd3b9a0 100644
--- a/audio/libsndfile/patches/patch-ad
+++ b/audio/libsndfile/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2004/04/02 10:13:43 adam Exp $
+$NetBSD: patch-ad,v 1.5 2004/06/28 08:14:03 adam Exp $
 
---- examples/Makefile.in.orig	2004-03-30 11:25:36.000000000 +0000
+--- examples/Makefile.in.orig	2004-06-16 10:18:29.000000000 +0000
 +++ examples/Makefile.in
-@@ -164,7 +164,7 @@ sndfile_info_SOURCES = sndfile-info.c 
+@@ -170,7 +170,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 7f304e17fa1..3ea70ca23b4 100644
--- a/audio/libsndfile/patches/patch-ae
+++ b/audio/libsndfile/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2004/04/02 09:37:56 jmmv Exp $
+$NetBSD: patch-ae,v 1.2 2004/06/28 08:14:03 adam Exp $
 
---- src/ima_adpcm.c.orig	2004-03-03 09:23:12.000000000 +0100
+--- src/ima_adpcm.c.orig	2004-06-16 10:17:04.000000000 +0000
 +++ src/ima_adpcm.c
-@@ -36,7 +36,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
- 	int				stepindx [2] ;
+@@ -37,7 +37,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
  	unsigned char	*block ;
  	short			*samples ;
--	unsigned short	data	[] ; /* ISO C99 struct hack */
-+	unsigned short	*data	; /* ISO C99 struct hack */
- } IMA_ADPCM_PRIVATE ;
- 
- /*============================================================================================
+ #if HAVE_FLEXIBLE_ARRAY
+-	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. */
+ #endif
diff --git a/audio/libsndfile/patches/patch-af b/audio/libsndfile/patches/patch-af
index 888f67413cd..7b1f9896fb8 100644
--- a/audio/libsndfile/patches/patch-af
+++ b/audio/libsndfile/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2004/04/02 09:37:56 jmmv Exp $
+$NetBSD: patch-af,v 1.2 2004/06/28 08:14:03 adam Exp $
 
---- src/ms_adpcm.c.orig	2004-03-03 09:23:12.000000000 +0100
+--- src/ms_adpcm.c.orig	2004-06-16 10:17:04.000000000 +0000
 +++ src/ms_adpcm.c
-@@ -43,7 +43,7 @@ typedef struct
- 	sf_count_t			samplecount ;
+@@ -44,7 +44,7 @@ typedef struct
  	short			*samples ;
  	unsigned char	*block ;
--	unsigned short	dummydata [] ; /* ISO C99 struct hack */
-+	unsigned short	*dummydata ; /* ISO C99 struct hack */
- } MSADPCM_PRIVATE ;
- 
- /*============================================================================================
+ #if HAVE_FLEXIBLE_ARRAY
+-	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. */
+ #endif
diff --git a/audio/libsndfile/patches/patch-ag b/audio/libsndfile/patches/patch-ag
index 062f5b74dca..4465a1a5b83 100644
--- a/audio/libsndfile/patches/patch-ag
+++ b/audio/libsndfile/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2004/04/02 09:37:56 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2004/06/28 08:14:03 adam Exp $
 
---- src/paf.c.orig	2004-03-03 09:23:12.000000000 +0100
+--- src/paf.c.orig	2004-06-16 10:17:04.000000000 +0000
 +++ src/paf.c
-@@ -64,7 +64,7 @@ typedef struct
- 	sf_count_t		sample_count ;
+@@ -65,7 +65,7 @@ typedef struct
  	int				*samples ;
  	unsigned char	*block ;
--	int				data [] ; /* ISO C99 struct hack */
-+	int				*data ; /* ISO C99 struct hack */
- } PAF24_PRIVATE ;
- 
- /*------------------------------------------------------------------------------
+ #if HAVE_FLEXIBLE_ARRAY
+-	int				data [] ; /* ISO C99 struct flexible array. */
++	int				*data ; /* ISO C99 struct flexible array. */
+ #else
+ 	int				data [1] ; /* This is a hack and may not work. */
+ #endif