[oe-commits] Tanu Kaskinen : pulseaudio: rdepend on modules referenced by start-pulseaudio-x11

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 780981b10dcd4201b8c74b9d33105f80c5801b38
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=780981b10dcd4201b8c74b9d33105f80c5801b38

Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Fri Jul 17 12:22:18 2015 +0300

pulseaudio: rdepend on modules referenced by start-pulseaudio-x11

pulseaudio-server contains /usr/bin/start-pulseaudio-x11 when X11 is
enabled, and that script tries to load module-device-manager,
module-x11-cork-request, module-x11-publish, and module-x11-xsmp.
Therefore, pulseaudio-server should rdepend on those modules when X11
is enabled, otherwise the script won't work as intended.

[YOCTO #8007]

Signed-off-by: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index b309d26..1a9d33a 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -160,5 +160,15 @@ RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
 FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
 FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
 
+# The console-kit module is good to have on X11 systems (it keeps PulseAudio
+# running for the duration of the user login session). The device-manager and
+# x11-* modules are referenced from the start-pulseaudio-x11 script, so those
+# modules must be installed when X11 is enabled.
 RDEPENDS_pulseaudio-server += "\
-        ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}"
+        ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\
+                pulseaudio-module-console-kit \
+                pulseaudio-module-device-manager \
+                pulseaudio-module-x11-cork-request \
+                pulseaudio-module-x11-publish \
+                pulseaudio-module-x11-xsmp \
+        ', '', d)}"