diff options
author | maya <maya@pkgsrc.org> | 2017-04-24 10:08:40 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2017-04-24 10:08:40 +0000 |
commit | d212006c56fc2b90fcf5b3e4d75829a760964932 (patch) | |
tree | b3820945780145aed6c6e62aa18030858835edce /audio | |
parent | 2569d8550384bf94f0af14620aa34b42bcc424eb (diff) | |
download | pkgsrc-d212006c56fc2b90fcf5b3e4d75829a760964932.tar.gz |
libsamplerate: declare AUDIO_OUT_s once and in audio_out.h
Fixes build failure with GCC 4.5.3 (netbsd 6.0)
Diffstat (limited to 'audio')
-rw-r--r-- | audio/libsamplerate/distinfo | 5 | ||||
-rw-r--r-- | audio/libsamplerate/patches/patch-examples_audio__out.h | 17 | ||||
-rw-r--r-- | audio/libsamplerate/patches/patch-examples_audio_out.c | 19 |
3 files changed, 36 insertions, 5 deletions
diff --git a/audio/libsamplerate/distinfo b/audio/libsamplerate/distinfo index dbe86deab61..f5eea7c14b1 100644 --- a/audio/libsamplerate/distinfo +++ b/audio/libsamplerate/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2017/04/12 18:47:39 maya Exp $ +$NetBSD: distinfo,v 1.12 2017/04/24 10:08:40 maya Exp $ SHA1 (libsamplerate-0.1.9.tar.gz) = ed60f957a4ff87aa15cbb1f3dbd886fa7e5e9566 RMD160 (libsamplerate-0.1.9.tar.gz) = ec6f3542b5e43f398ad7e5dfd9dc35902b06d762 SHA512 (libsamplerate-0.1.9.tar.gz) = 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728 Size (libsamplerate-0.1.9.tar.gz) = 4336641 bytes -SHA1 (patch-examples_audio_out.c) = 7b6cbcdc31e8e7da1d3453f9a59ee910296e4109 +SHA1 (patch-examples_audio__out.h) = 52d0f7666d4ff5b1463e7242f3ff2befc0d35606 +SHA1 (patch-examples_audio_out.c) = 4fb964da017372431dde99b71b5aa96cbb66a64c diff --git a/audio/libsamplerate/patches/patch-examples_audio__out.h b/audio/libsamplerate/patches/patch-examples_audio__out.h new file mode 100644 index 00000000000..148ae7c2788 --- /dev/null +++ b/audio/libsamplerate/patches/patch-examples_audio__out.h @@ -0,0 +1,17 @@ +$NetBSD: patch-examples_audio__out.h,v 1.1 2017/04/24 10:08:40 maya Exp $ + +Declare AUDIO_OUT_s once and in audio_out.h + +--- examples/audio_out.h.orig 2016-09-13 10:20:20.000000000 +0000 ++++ examples/audio_out.h +@@ -6,7 +6,9 @@ + ** file at : https://github.com/erikd/libsamplerate/blob/master/COPYING + */ + +-typedef struct AUDIO_OUT_s AUDIO_OUT ; ++typedef struct AUDIO_OUT_s ++{ int magic ; ++} AUDIO_OUT ; + + typedef int (*get_audio_callback_t) (void *callback_data, float *samples, int frames) ; + diff --git a/audio/libsamplerate/patches/patch-examples_audio_out.c b/audio/libsamplerate/patches/patch-examples_audio_out.c index 7e8b8a20f85..58e4360ea89 100644 --- a/audio/libsamplerate/patches/patch-examples_audio_out.c +++ b/audio/libsamplerate/patches/patch-examples_audio_out.c @@ -1,10 +1,23 @@ -$NetBSD: patch-examples_audio_out.c,v 1.1 2012/07/04 08:59:23 adam Exp $ +$NetBSD: patch-examples_audio_out.c,v 1.2 2017/04/24 10:08:40 maya Exp $ Fix building on Mac OS X. +declare typedef AUDIO_OUT_s once and in audio_out.h ---- examples/audio_out.c.orig 2012-06-22 20:14:44.000000000 +0000 +--- examples/audio_out.c.orig 2016-09-13 10:20:20.000000000 +0000 +++ examples/audio_out.c -@@ -168,7 +168,6 @@ linux_close (AUDIO_OUT *audio_out) +@@ -33,11 +33,6 @@ + #define MAKE_MAGIC(a,b,c,d,e,f,g,h) \ + ((a) + ((b) << 1) + ((c) << 2) + ((d) << 3) + ((e) << 4) + ((f) << 5) + ((g) << 6) + ((h) << 7)) + +-typedef struct AUDIO_OUT_s +-{ int magic ; +-} AUDIO_OUT ; +- +- + /*------------------------------------------------------------------------------ + ** Linux (ALSA and OSS) functions for playing a sound. + */ +@@ -432,7 +427,6 @@ opensoundsys_close (AUDIO_OUT *audio_out #if (defined (__MACH__) && defined (__APPLE__)) /* MacOSX */ |