--- a/components/desktop/pulseaudio/Makefile	Mon Apr 03 16:07:26 2017 -0700
+++ b/components/desktop/pulseaudio/Makefile	Mon Apr 03 15:13:06 2017 -0700
@@ -23,7 +23,7 @@
 # Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
-BUILD_BITS = 		32_and_64
+BUILD_BITS = 		64_and_32
 COMPILER = 		gcc
 include ../../../make-rules/shared-macros.mk
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/pulseaudio/patches/08-default.patch	Mon Apr 03 15:13:06 2017 -0700
@@ -0,0 +1,23 @@
+# Bug 25789688 - Pulseaudio needs to use the oss solaris audio driver. 
+# This changes the default configuration that is delivered to solaris
+# users.  The primary need is to allow pulseaudio to use the oss audio 
+# driver, instead of the custom (non oss) driver interface that is supplied
+# as part of the upstream source.  
+#
+# IMHO the library called module_solaris.so is no longer needed and had we
+# been tracking the community more closely, we would have been on the oss
+# interface long ago.  
+#
+# We should be working with the upstream community to phase out the library
+# module_solaris.so as obsolete.
+# 
+--- pulseaudio-9.0/src/daemon/a	2017-03-30 12:17:40.709473123 -0700
++++ pulseaudio-9.0/src/daemon/default.pa.in	2017-03-30 12:19:35.125104134 -0700
+@@ -41,6 +41,7 @@
+ #load-module module-alsa-source device=hw:1,0
+ ])dnl
+ ifelse(@HAVE_OSS_OUTPUT@, 1, [dnl
++load-module module-oss 
+ #load-module module-oss device="/dev/dsp" sink_name=output source_name=input
+ #load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+ ])dnl

--- a/components/desktop/pulseaudio/pulseaudio.p5m	Mon Apr 03 16:07:26 2017 -0700
+++ b/components/desktop/pulseaudio/pulseaudio.p5m	Mon Apr 03 15:13:06 2017 -0700
@@ -47,18 +47,6 @@
 file path=etc/pulse/default.pa
 file path=etc/pulse/system.pa
 file path=etc/xdg/autostart/pulseaudio.desktop
-file path=usr/bin/$(MACH64)/esdcompat
-file path=usr/bin/$(MACH64)/pacat
-file path=usr/bin/$(MACH64)/pacmd
-file path=usr/bin/$(MACH64)/pactl
-link path=usr/bin/$(MACH64)/pamon target=pacat
-link path=usr/bin/$(MACH64)/paplay target=pacat
-link path=usr/bin/$(MACH64)/parec target=pacat
-link path=usr/bin/$(MACH64)/parecord target=pacat
-file path=usr/bin/$(MACH64)/pasuspender
-file path=usr/bin/$(MACH64)/pax11publish
-file path=usr/bin/$(MACH64)/pulseaudio
-file path=usr/bin/$(MACH64)/start-pulseaudio-x11
 file path=usr/bin/esdcompat
 file path=usr/bin/pacat
 file path=usr/bin/pacmd
@@ -175,7 +163,6 @@
 file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-simple-protocol-unix.so
 file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-sine-source.so
 file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-sine.so
-file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-solaris.so
 file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-stream-restore.so
 file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-suspend-on-idle.so
 file path=usr/lib/$(MACH64)/pulse-$(COMPONENT_VERSION)/modules/module-switch-on-connect.so
@@ -268,7 +255,6 @@
 file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-simple-protocol-unix.so
 file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-sine-source.so
 file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-sine.so
-file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-solaris.so
 file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-stream-restore.so
 file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-suspend-on-idle.so
 file path=usr/lib/pulse-$(COMPONENT_VERSION)/modules/module-switch-on-connect.so