Extend previous to apply to netbsd-6 also (at least the one currently on

netbsd-daily and soon be in BETA2)

2 files changed, 21 insertions, 22 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 3f208b08ef5..452b71c2c38 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2012/05/14 14:56:51 obache Exp $
+$NetBSD: distinfo,v 1.30 2012/05/14 18:01:45 abs Exp $
 
 SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
 Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes
-SHA1 (patch-aa) = f19605eadd8495ebbefc5dd0e95494520910e67d
+SHA1 (patch-aa) = bf74977dbb9d9aa7d6237924776fae7da2ea6dde
 SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f
 SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0
 SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442
diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa
index 50b3a1fefae..c1b75ad52db 100644
--- a/audio/pulseaudio/patches/patch-aa
+++ b/audio/pulseaudio/patches/patch-aa
@@ -1,11 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2012/05/14 14:56:51 obache Exp $
-
-SNDDSP_GETODELAY isn't defined on NetBSD-4.x.
-ioctl() takes u_long argument on NetBSD.
-On NetBSD<6.99.7, use third parameter in ioctl instead of varargs.
-stat() system call has been versioned, use latest version when dlopen()ing.
-Try more typical device names.
-SOUND_PCM_* is not available on SunOS.
+$NetBSD: patch-aa,v 1.10 2012/05/14 18:01:45 abs Exp $
 
 --- src/utils/padsp.c.orig	2009-09-18 20:21:44.000000000 +0000
 +++ src/utils/padsp.c
@@ -111,20 +104,26 @@ SOUND_PCM_* is not available on SunOS.
          case SNDCTL_DSP_GETOPTR: {
              count_info *info;
  
-@@ -2317,21 +2345,29 @@ fail:
+@@ -2317,21 +2345,35 @@ fail:
      return ret;
  }
  
 -#ifdef sun
++/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 600000000 ||  \
++    (__NetBSD_Version__ > 699000000 && 699000700 < 699000700) )
++# define OLD_NETBSD_IOCTL_CALL
++#endif
++
 +#ifdef __sun
  int ioctl(int fd, int request, ...) {
-+#elif defined(__NetBSD__) && (__NetBSD_Version__ < 699000700)
++#elif defined(OLD_NETBSD_IOCTL_CALL)
 +int ioctl(int fd, u_long request, void *_argp) {
  #else
  int ioctl(int fd, unsigned long request, ...) {
  #endif
      fd_info *i;
-+#if !(defined(__NetBSD__) && (__NetBSD_Version__ < 699000700))
++#if !defined(OLD_NETBSD_IOCTL_CALL)
      va_list args;
 +#endif
      void *argp;
@@ -132,7 +131,7 @@ SOUND_PCM_* is not available on SunOS.
  
      debug(DEBUG_LEVEL_VERBOSE, __FILE__": ioctl()\n");
  
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000700)
++#if defined(OLD_NETBSD_IOCTL_CALL)
 +    argp = _argp;
 +#else
      va_start(args, request);
@@ -142,7 +141,7 @@ SOUND_PCM_* is not available on SunOS.
  
      if (!function_enter()) {
          LOAD_IOCTL_FUNC();
-@@ -2390,6 +2426,8 @@ int access(const char *pathname, int mod
+@@ -2390,6 +2432,8 @@ int access(const char *pathname, int mod
      if (!pathname ||
          (strcmp(pathname, "/dev/dsp") != 0 &&
           strcmp(pathname, "/dev/adsp") != 0 &&
@@ -151,7 +150,7 @@ SOUND_PCM_* is not available on SunOS.
           strcmp(pathname, "/dev/sndstat") != 0 &&
           strcmp(pathname, "/dev/mixer") != 0 )) {
          LOAD_ACCESS_FUNC();
-@@ -2418,6 +2456,8 @@ int stat(const char *pathname, struct st
+@@ -2418,6 +2462,8 @@ int stat(const char *pathname, struct st
      if (!pathname ||
          !buf ||
          ( strcmp(pathname, "/dev/dsp") != 0 &&
@@ -160,7 +159,7 @@ SOUND_PCM_* is not available on SunOS.
            strcmp(pathname, "/dev/adsp") != 0 &&
            strcmp(pathname, "/dev/sndstat") != 0 &&
            strcmp(pathname, "/dev/mixer") != 0 )) {
-@@ -2475,6 +2515,8 @@ int stat64(const char *pathname, struct 
+@@ -2475,6 +2521,8 @@ int stat64(const char *pathname, struct 
      if (!pathname ||
          !buf ||
          ( strcmp(pathname, "/dev/dsp") != 0 &&
@@ -169,7 +168,7 @@ SOUND_PCM_* is not available on SunOS.
            strcmp(pathname, "/dev/adsp") != 0 &&
            strcmp(pathname, "/dev/sndstat") != 0 &&
            strcmp(pathname, "/dev/mixer") != 0 )) {
-@@ -2520,6 +2562,8 @@ int open64(const char *filename, int fla
+@@ -2520,6 +2568,8 @@ int open64(const char *filename, int fla
  
      if (!filename ||
          ( strcmp(filename, "/dev/dsp") != 0 &&
@@ -178,7 +177,7 @@ SOUND_PCM_* is not available on SunOS.
            strcmp(filename, "/dev/adsp") != 0 &&
            strcmp(filename, "/dev/sndstat") != 0 &&
            strcmp(filename, "/dev/mixer") != 0 )) {
-@@ -2540,6 +2584,8 @@ int __xstat(int ver, const char *pathnam
+@@ -2540,6 +2590,8 @@ int __xstat(int ver, const char *pathnam
      if (!pathname ||
          !buf ||
          ( strcmp(pathname, "/dev/dsp") != 0 &&
@@ -187,7 +186,7 @@ SOUND_PCM_* is not available on SunOS.
            strcmp(pathname, "/dev/adsp") != 0 &&
            strcmp(pathname, "/dev/sndstat") != 0 &&
            strcmp(pathname, "/dev/mixer") != 0 )) {
-@@ -2563,6 +2609,8 @@ int __xstat64(int ver, const char *pathn
+@@ -2563,6 +2615,8 @@ int __xstat64(int ver, const char *pathn
      if (!pathname ||
          !buf ||
          ( strcmp(pathname, "/dev/dsp") != 0 &&
@@ -196,7 +195,7 @@ SOUND_PCM_* is not available on SunOS.
            strcmp(pathname, "/dev/adsp") != 0 &&
            strcmp(pathname, "/dev/sndstat") != 0 &&
            strcmp(pathname, "/dev/mixer") != 0 )) {
-@@ -2592,6 +2640,8 @@ FILE* fopen(const char *filename, const 
+@@ -2592,6 +2646,8 @@ FILE* fopen(const char *filename, const 
      if (!filename ||
          !mode ||
          ( strcmp(filename, "/dev/dsp") != 0 &&
@@ -205,7 +204,7 @@ SOUND_PCM_* is not available on SunOS.
            strcmp(filename, "/dev/adsp") != 0 &&
            strcmp(filename, "/dev/sndstat") != 0 &&
            strcmp(filename, "/dev/mixer") != 0 )) {
-@@ -2635,6 +2685,8 @@ FILE *fopen64(const char *filename, cons
+@@ -2635,6 +2691,8 @@ FILE *fopen64(const char *filename, cons
      if (!filename ||
          !mode ||
          ( strcmp(filename, "/dev/dsp") != 0 &&