summaryrefslogtreecommitdiff
path: root/audio/libsndfile/patches
diff options
context:
space:
mode:
Diffstat (limited to 'audio/libsndfile/patches')
-rw-r--r--audio/libsndfile/patches/patch-aa6
-rw-r--r--audio/libsndfile/patches/patch-ab16
-rw-r--r--audio/libsndfile/patches/patch-ac14
-rw-r--r--audio/libsndfile/patches/patch-ad6
-rw-r--r--audio/libsndfile/patches/patch-ae6
-rw-r--r--audio/libsndfile/patches/patch-af6
6 files changed, 27 insertions, 27 deletions
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