From 6112b937254a1b776f1d0b86b995a0e9734e0786 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Mon, 16 Mar 2015 14:57:49 +0000
Subject: Fix build on SunOS, catch up with latest API.

---
 audio/pulseaudio/distinfo                          |  3 +-
 .../patches/patch-src_modules_module-solaris.c     | 35 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 audio/pulseaudio/patches/patch-src_modules_module-solaris.c

(limited to 'audio')

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index c016ae6d1d3..99b8a1a78fd 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2015/02/28 23:41:58 joerg Exp $
+$NetBSD: distinfo,v 1.52 2015/03/16 14:57:49 jperkin Exp $
 
 SHA1 (pulseaudio-6.0.tar.xz) = 3607d523fb270d9b68463de30f5d9e17957f1088
 RMD160 (pulseaudio-6.0.tar.xz) = a3f96cabc2872646c34ba581d6044dc4a6513fd9
@@ -10,6 +10,7 @@ SHA1 (patch-src_Makefile.in) = acbd3abee7225a7b3f1c422e30d9efe2adb1253c
 SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
 SHA1 (patch-src_daemon_main.c) = 8cdabd3c631cc5e7c7f370e364d9511b23f88668
 SHA1 (patch-src_modules_module-detect.c) = 25c803ee2d5addf9dbf522d81bd422dc201d4550
+SHA1 (patch-src_modules_module-solaris.c) = 03ea8912da4bb76294ca23271e47d40a8c9a61a7
 SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
 SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
 SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831
diff --git a/audio/pulseaudio/patches/patch-src_modules_module-solaris.c b/audio/pulseaudio/patches/patch-src_modules_module-solaris.c
new file mode 100644
index 00000000000..1fc6541e100
--- /dev/null
+++ b/audio/pulseaudio/patches/patch-src_modules_module-solaris.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_modules_module-solaris.c,v 1.1 2015/03/16 14:57:49 jperkin Exp $
+
+Catch up with newer API.
+
+--- src/modules/module-solaris.c.orig	2015-02-12 14:10:35.000000000 +0000
++++ src/modules/module-solaris.c
+@@ -412,10 +412,12 @@ static int sink_process_msg(pa_msgobject
+                         pa_smoother_resume(u->smoother, pa_rtclock_now(), true);
+ 
+                         if (!u->source || u->source_suspended) {
++                            bool mute;
+                             if (unsuspend(u) < 0)
+                                 return -1;
+                             u->sink->get_volume(u->sink);
+-                            u->sink->get_mute(u->sink);
++                            if (u->sink->get_mute(u->sink, &mute) >= 0)
++                                pa_sink_set_mute(u->sink, mute, false);
+                         }
+                         u->sink_suspended = false;
+                     }
+@@ -1033,8 +1035,12 @@ int pa__init(pa_module *m) {
+ 
+         if (sink_new_data.muted_is_set)
+             u->sink->set_mute(u->sink);
+-        else
+-            u->sink->get_mute(u->sink);
++        else {
++            bool mute;
++
++            if (u->sink->get_mute(u->sink, &mute) >= 0)
++                pa_sink_set_mute(u->sink, mute, false);
++        }
+ 
+         pa_sink_put(u->sink);
+     }
-- 
cgit v1.2.3