@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2014/06/11 01:33:59 dsainty Exp $
+$NetBSD: distinfo,v 1.43 2014/06/16 13:26:25 jperkin Exp $
 
 SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85
 RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991
 Size (pulseaudio-5.0.tar.xz) = 1455428 bytes
-SHA1 (patch-aa) = c8bd0e5b6e4c4068d8706aea62ce248bb79184d7
+SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b
 SHA1 (patch-configure.ac) = f7c54eca4613c6f14732683f2f24ca81f723320d
 SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
 SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78

@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.15 2014/06/09 13:08:19 ryoon Exp $
+$NetBSD: patch-aa,v 1.16 2014/06/16 13:26:25 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.
@@ -84,14 +84,14 @@
          case SOUND_PCM_READ_RATE:
              debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
  
-@@ -2284,6 +2311,7 @@ static int dsp_ioctl(fd_info *i, unsigne
-             *(int*) argp = i->sample_spec.rate;
+@@ -2300,6 +2327,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             *(int*) argp = pa_sample_size(&i->sample_spec)*8;
              pa_threaded_mainloop_unlock(i->mainloop);
              break;
 +#endif
  
-         case SOUND_PCM_READ_CHANNELS:
-             debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n");
+         case SNDCTL_DSP_GETOPTR: {
+             count_info *info;
 @@ -2370,21 +2398,35 @@ fail:
      return ret;
  }