pulseaudio: Fix cpp statements, fixes SunOS build.

2 files changed, 36 insertions, 9 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 725e70fa5ba..96e38981ff5 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.61 2017/09/08 02:27:44 ryoon Exp $
+$NetBSD: distinfo,v 1.62 2017/09/20 13:19:29 jperkin Exp $
 
 SHA1 (pulseaudio-11.0.tar.xz) = df04f9ffb3fc1de9255f8b88e5d824fcd942607d
 RMD160 (pulseaudio-11.0.tar.xz) = 7141c35cc36a9a3e2465977f87acdd38466ec602
 SHA512 (pulseaudio-11.0.tar.xz) = 37d0afe343c136cef1906342f17c3473f791fe17b7e6dd463ce120d45285bc12e3680b8b4b6779d79b8ce2e755fe2a0cc4d4c960209b1dae9f924731484ecded
 Size (pulseaudio-11.0.tar.xz) = 1648128 bytes
-SHA1 (patch-aa) = 01d6a4f3db5b61e3e8cb2956b53676d86692f846
+SHA1 (patch-aa) = d99611639f360bb274a2a24636a3cce122cb10fc
 SHA1 (patch-configure.ac) = ceb209d48d7e484b21c2f00282b32440dafee7d5
 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
 SHA1 (patch-src_modules_module-detect.c) = f202194b03a2023959d772392d58297f963f0ada
diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa
index c8387625cbf..444bd2049b8 100644
--- a/audio/pulseaudio/patches/patch-aa
+++ b/audio/pulseaudio/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.18 2016/08/04 16:45:55 ryoon Exp $
+$NetBSD: patch-aa,v 1.19 2017/09/20 13:19:29 jperkin 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.
@@ -6,7 +6,7 @@ stat() system call has been versioned, use latest version when dlopen()ing.
 Try more typical device names.
 SOUND_PCM_* is not available on SunOS.
 
---- src/utils/padsp.c.orig	2016-05-03 06:17:39.000000000 +0000
+--- src/utils/padsp.c.orig	2017-09-03 11:41:12.000000000 +0000
 +++ src/utils/padsp.c
 @@ -48,6 +48,10 @@
  #include <linux/sockios.h>
@@ -19,7 +19,7 @@ SOUND_PCM_* is not available on SunOS.
  #include <pulse/pulseaudio.h>
  #include <pulse/gccmacro.h>
  #include <pulsecore/llist.h>
-@@ -113,7 +117,11 @@ static pthread_mutex_t func_mutex = PTHR
+@@ -115,7 +119,11 @@ static pthread_mutex_t func_mutex = PTHR
  
  static PA_LLIST_HEAD(fd_info, fd_infos) = NULL;
  
@@ -31,7 +31,7 @@ SOUND_PCM_* is not available on SunOS.
  static int (*_close)(int) = NULL;
  static int (*_open)(const char *, int, mode_t) = NULL;
  static int (*___open_2)(const char *, int) = NULL;
-@@ -141,6 +149,15 @@ static inline fnptr dlsym_fn(void *handl
+@@ -143,6 +151,15 @@ static inline fnptr dlsym_fn(void *handl
      return (fnptr) (long) dlsym(handle, symbol);
  }
  
@@ -47,7 +47,7 @@ SOUND_PCM_* is not available on SunOS.
  #define LOAD_IOCTL_FUNC() \
  do { \
      pthread_mutex_lock(&func_mutex); \
-@@ -148,6 +165,7 @@ do { \
+@@ -150,6 +167,7 @@ do { \
          _ioctl = (int (*)(int, int, void*)) dlsym_fn(RTLD_NEXT, "ioctl"); \
      pthread_mutex_unlock(&func_mutex); \
  } while(0)
@@ -55,7 +55,7 @@ SOUND_PCM_* is not available on SunOS.
  
  #define LOAD_OPEN_FUNC() \
  do { \
-@@ -197,11 +215,21 @@ do { \
+@@ -199,11 +217,21 @@ do { \
      pthread_mutex_unlock(&func_mutex); \
  } while(0)
  
@@ -78,7 +78,34 @@ SOUND_PCM_* is not available on SunOS.
      pthread_mutex_unlock(&func_mutex); \
  } while(0)
  
-@@ -2377,21 +2405,33 @@ fail:
+@@ -2295,7 +2323,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             break;
+         }
+ 
+-#ifdef HAVE_DECL_SOUND_PCM_READ_RATE
++#if HAVE_DECL_SOUND_PCM_READ_RATE
+         case SOUND_PCM_READ_RATE:
+             debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
+ 
+@@ -2305,7 +2333,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             break;
+ #endif
+ 
+-#ifdef HAVE_DECL_SOUND_PCM_READ_CHANNELS
++#if HAVE_DECL_SOUND_PCM_READ_CHANNELS
+         case SOUND_PCM_READ_CHANNELS:
+             debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n");
+ 
+@@ -2315,7 +2343,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             break;
+ #endif
+ 
+-#ifdef HAVE_DECL_SOUND_PCM_READ_BITS
++#if HAVE_DECL_SOUND_PCM_READ_BITS
+         case SOUND_PCM_READ_BITS:
+             debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_BITS\n");
+ 
+@@ -2394,21 +2422,33 @@ fail:
      return ret;
  }