diff options
| author | wiz <wiz@pkgsrc.org> | 2013-11-25 10:14:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-11-25 10:14:37 +0000 |
| commit | e0b734b71407dcd42bf62278f54474dd20c517c2 (patch) | |
| tree | b75bfc2ec94673e5080ac9b4ee44ac96a2d309d1 /audio | |
| parent | ed208aee4a074cf899f9f0bc455be4df955cf584 (diff) | |
| download | pkgsrc-e0b734b71407dcd42bf62278f54474dd20c517c2.tar.gz | |
Use correct stat syscall on NetBSD-6 and newer.
Based on PR 48405 by Nat Sloss.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/pulseaudio/distinfo | 6 | ||||
| -rw-r--r-- | audio/pulseaudio/patches/patch-aa | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index f0e02a5d952..7a80f6c9acf 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.37 2013/10/24 17:48:53 jperkin Exp $ +$NetBSD: distinfo,v 1.38 2013/11/25 10:14:37 wiz Exp $ SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01 RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485 Size (pulseaudio-2.1.tar.xz) = 1355004 bytes -SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7 +SHA1 (patch-aa) = 2fb8b36669e34f3ca0108176171be567a9eeda44 SHA1 (patch-configure) = 79f938c79a2c3a714d9c81b22030084a421da360 -SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3 +SHA1 (patch-dc) = 1e8d79a37617aae18f55564757b5065fef2b9025 SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78 SHA1 (patch-src_pulsecore_semaphore-osx.c) = f9b1962a700932434e05471b2d4df4a5ff5c1b00 SHA1 (patch-src_pulsecore_svolume__mmx.c) = a3af18563fd11e3813d7a474ff8807ee9bf62390 diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa index 893a061b942..95f37c46d19 100644 --- a/audio/pulseaudio/patches/patch-aa +++ b/audio/pulseaudio/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.13 2012/11/03 01:54:55 ryoon Exp $ +$NetBSD: patch-aa,v 1.14 2013/11/25 10:14:37 wiz Exp $ ioctl() takes u_long argument on NetBSD. On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs. @@ -54,13 +54,17 @@ SOUND_PCM_* is not available on SunOS. #define LOAD_OPEN_FUNC() \ do { \ -@@ -199,11 +216,16 @@ do { \ +@@ -199,11 +216,20 @@ do { \ pthread_mutex_unlock(&func_mutex); \ } while(0) +#ifdef __NetBSD__ ++#if (__NetBSD_Version__ < 600000000) +#define STAT_FUNC "__stat30" +#else ++#define STAT_FUNC "__stat50" ++#endif ++#else +#define STAT_FUNC "stat" +#endif #define LOAD_STAT_FUNC() \ @@ -72,7 +76,7 @@ SOUND_PCM_* is not available on SunOS. pthread_mutex_unlock(&func_mutex); \ } while(0) -@@ -2264,6 +2286,7 @@ static int dsp_ioctl(fd_info *i, unsigne +@@ -2264,6 +2290,7 @@ static int dsp_ioctl(fd_info *i, unsigne break; } @@ -80,7 +84,7 @@ SOUND_PCM_* is not available on SunOS. case SOUND_PCM_READ_RATE: debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n"); -@@ -2288,6 +2311,7 @@ static int dsp_ioctl(fd_info *i, unsigne +@@ -2288,6 +2315,7 @@ static int dsp_ioctl(fd_info *i, unsigne pa_threaded_mainloop_unlock(i->mainloop); break; @@ -88,7 +92,7 @@ SOUND_PCM_* is not available on SunOS. case SNDCTL_DSP_GETOPTR: { count_info *info; -@@ -2357,21 +2381,35 @@ fail: +@@ -2357,21 +2385,35 @@ fail: return ret; } |