mycroft-core: many pulseaudio fixes

5 files changed, 9 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54fe919b957d..fd23df772e1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -33,12 +33,10 @@ pkgbase = mycroft-core
 	source = mycroft.tmpfiles
 	source = mycroft.sysusers
 	source = mycroft.service
-	source = mycroft.pulseaudio
 	md5sums = 04ec4428ad8ee3787e798bcd5a7ed23a
-	md5sums = 6712830084b2d2845f7c1db46410cfc7
+	md5sums = 679808c9cbbcd0770772a08345cd752f
 	md5sums = f4b41cc9e1a7308c8833f0f7804d8c02
 	md5sums = a587888fcaf792ab9ceb6c698bb03ac3
-	md5sums = ffd5e294798abaa35bb79f2b1afd40e1
 
 pkgname = mycroft-core
 
diff --git a/PKGBUILD b/PKGBUILD
index edf98d5722de..28b6d6981cc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ source=("https://github.com/MycroftAI/mycroft-core/archive/release/v${pkgver}.ta
 	"mycroft.tmpfiles"
 	"mycroft.sysusers"
 	"mycroft.service"
-"mycroft.pulseaudio")
+)
 
 prepare() {
 	cd $srcdir/$pkgname-release-v$pkgver
@@ -66,13 +66,9 @@ package() {
 	# Cleanup
 	find . -name "*.py[co]" -o -name __pycache__ -exec rm -rf {} +
 	rm -rf "$pkgdir/usr/share/mycroft-core/test"
-
-	# Pulseaudio Workaround (any suggestion is well accepted)
-	install -D -m644 "${srcdir}/mycroft.pulseaudio" "${pkgdir}/usr/share/mycroft-core/pulse-client.conf"
 }
 
 md5sums=('04ec4428ad8ee3787e798bcd5a7ed23a'
-	'6712830084b2d2845f7c1db46410cfc7'
+	'679808c9cbbcd0770772a08345cd752f'
 	'f4b41cc9e1a7308c8833f0f7804d8c02'
-	'a587888fcaf792ab9ceb6c698bb03ac3'
-'ffd5e294798abaa35bb79f2b1afd40e1')
+'a587888fcaf792ab9ceb6c698bb03ac3')
diff --git a/mycroft-core.install b/mycroft-core.install
index cbf6fedb90ad..03e2141e6e1d 100644
--- a/mycroft-core.install
+++ b/mycroft-core.install
@@ -3,8 +3,11 @@ post_install() {
   echo "====     sudo gpasswd -a mycroft audio"
   echo "====     sudo gpasswd -a mycroft dbus"
   echo "====     sudo gpasswd -a mycroft network"
-  echo "====>  Add this line to /etc/default.pa PulseAudio file configuration and restart PulseAudio"
-  echo "====     load-module module-native-protocol-unix auth-anonymous=1 socket=/tmp/pulse-socket"
+  echo "====>  Replace this line within /etc/pulse/default.pa:"
+  echo "====     load-module module-native-protocol-unix"
+  echo "====>  with:"
+  echo "====     load-module module-native-protocol-unix auth-anonymous=1"
+  echo "====>  Restart PulseAudio"
   echo "====>  Finally run:"
   echo "====	 systemctl start mycroft.service"
 }
diff --git a/mycroft.pulseaudio b/mycroft.pulseaudio
deleted file mode 100644
index 784060916c09..000000000000
--- a/mycroft.pulseaudio
+++ /dev/null
@@ -1,6 +0,0 @@
-# This is a working example to get PulseAudio working when no root privileges are involved
-# References to:
-#  https://wiki.archlinux.org/index.php/PulseAudio/Examples#Allowing_multiple_users_to_use_PulseAudio_at_the_same_time
-#
-# Copy this file into /var/lib/mycroft/.config/pulse/client.conf
-default-server = unix:/tmp/pulse-socket
diff --git a/mycroft.tmpfiles b/mycroft.tmpfiles
index 82c577e9a768..0e709e16b3b7 100644
--- a/mycroft.tmpfiles
+++ b/mycroft.tmpfiles
@@ -1,6 +1,5 @@
 Z /usr/share/mycroft-core 0755 mycroft mycroft 
 Z /var/lib/mycroft 0755 mycroft mycroft
-L /var/lib/mycroft/.config/pulse/client.conf - - - - /usr/share/mycroft-core/pulse-client.conf
 d /var/log/mycroft 0755 mycroft mycroft 
 d /opt/mycroft/ 0755 mycroft mycroft
 d /tmp/mycroft/ 0755 mycroft mycroft