Fix build under NetBSD 1.6 (gcc2).

5 files changed, 57 insertions, 1 deletions

diff --git a/audio/libsndfile/distinfo b/audio/libsndfile/distinfo
index 5c21b04af48..7df9b9d392d 100644
--- a/audio/libsndfile/distinfo
+++ b/audio/libsndfile/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.10 2004/03/29 08:08:13 adam Exp $
+$NetBSD: distinfo,v 1.11 2004/04/02 09:37:56 jmmv Exp $
 
 SHA1 (libsndfile-1.0.8.tar.gz) = d2bfeb1b1303ace8e1de0498ed825b3b2f124cb2
 Size (libsndfile-1.0.8.tar.gz) = 767873 bytes
 SHA1 (patch-aa) = 711c997c6ebc449a7b602bd6d82156c637d7b8f3
+SHA1 (patch-ab) = 249e605fb37a6b29e4cf7ba4809901e4aab6b584
 SHA1 (patch-ac) = a88ee2a08da33ff1b775d56e073ea9193e2c9c7f
 SHA1 (patch-ad) = 64b70719fa944eb241c88e77beaf67e017568da1
+SHA1 (patch-ae) = fb5a03eb15212bdd28ce395e4bd382bc885ce093
+SHA1 (patch-af) = 229534b39e182da2ae1ec54f94c7b837ddf3ba58
+SHA1 (patch-ag) = d8e953da32ac0eb8c700f879cd491b1b977a216d
diff --git a/audio/libsndfile/patches/patch-ab b/audio/libsndfile/patches/patch-ab
new file mode 100644
index 00000000000..fdd13738cc0
--- /dev/null
+++ b/audio/libsndfile/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2004/04/02 09:37:56 jmmv Exp $
+
+--- src/common.h.orig	2004-03-09 14:02:41.000000000 +0100
++++ src/common.h
+@@ -117,7 +117,7 @@ typedef struct
+ typedef struct
+ {	unsigned int	version ;	/* version of the PEAK chunk */
+ 	unsigned int	timestamp ;	/* secs since 1/1/1970  */
+-	PEAK_POS		peaks [] ;	/* the per channel peak info */
++	PEAK_POS		*peaks ;	/* the per channel peak info */
+ } PEAK_CHUNK ;
+ 
+ typedef struct
diff --git a/audio/libsndfile/patches/patch-ae b/audio/libsndfile/patches/patch-ae
new file mode 100644
index 00000000000..7f304e17fa1
--- /dev/null
+++ b/audio/libsndfile/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/04/02 09:37:56 jmmv Exp $
+
+--- src/ima_adpcm.c.orig	2004-03-03 09:23:12.000000000 +0100
++++ src/ima_adpcm.c
+@@ -36,7 +36,7 @@ typedef struct IMA_ADPCM_PRIVATE_tag
+ 	int				stepindx [2] ;
+ 	unsigned char	*block ;
+ 	short			*samples ;
+-	unsigned short	data	[] ; /* ISO C99 struct hack */
++	unsigned short	*data	; /* ISO C99 struct hack */
+ } IMA_ADPCM_PRIVATE ;
+ 
+ /*============================================================================================
diff --git a/audio/libsndfile/patches/patch-af b/audio/libsndfile/patches/patch-af
new file mode 100644
index 00000000000..888f67413cd
--- /dev/null
+++ b/audio/libsndfile/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/04/02 09:37:56 jmmv Exp $
+
+--- src/ms_adpcm.c.orig	2004-03-03 09:23:12.000000000 +0100
++++ src/ms_adpcm.c
+@@ -43,7 +43,7 @@ typedef struct
+ 	sf_count_t			samplecount ;
+ 	short			*samples ;
+ 	unsigned char	*block ;
+-	unsigned short	dummydata [] ; /* ISO C99 struct hack */
++	unsigned short	*dummydata ; /* ISO C99 struct hack */
+ } MSADPCM_PRIVATE ;
+ 
+ /*============================================================================================
diff --git a/audio/libsndfile/patches/patch-ag b/audio/libsndfile/patches/patch-ag
new file mode 100644
index 00000000000..062f5b74dca
--- /dev/null
+++ b/audio/libsndfile/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/04/02 09:37:56 jmmv Exp $
+
+--- src/paf.c.orig	2004-03-03 09:23:12.000000000 +0100
++++ src/paf.c
+@@ -64,7 +64,7 @@ typedef struct
+ 	sf_count_t		sample_count ;
+ 	int				*samples ;
+ 	unsigned char	*block ;
+-	int				data [] ; /* ISO C99 struct hack */
++	int				*data ; /* ISO C99 struct hack */
+ } PAF24_PRIVATE ;
+ 
+ /*------------------------------------------------------------------------------