summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2015-07-17 12:22:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-20 10:40:41 +0100
commitd0ae6fa1691fad1da79003e83d6eccdc6db22b99 (patch)
tree33b3c0b1c27c3bc4edb0614cf71007d5f94af698 /meta
parent7942e645b382695d74043c57838051c88e52ed4a (diff)
downloadpoky-d0ae6fa1691fad1da79003e83d6eccdc6db22b99.tar.gz
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] (From OE-Core rev: 780981b10dcd4201b8c74b9d33105f80c5801b38) Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index b309d26079..1a9d33a7e8 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"
160FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" 160FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
161FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 161FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
162 162
163# The console-kit module is good to have on X11 systems (it keeps PulseAudio
164# running for the duration of the user login session). The device-manager and
165# x11-* modules are referenced from the start-pulseaudio-x11 script, so those
166# modules must be installed when X11 is enabled.
163RDEPENDS_pulseaudio-server += "\ 167RDEPENDS_pulseaudio-server += "\
164 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}" 168 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\
169 pulseaudio-module-console-kit \
170 pulseaudio-module-device-manager \
171 pulseaudio-module-x11-cork-request \
172 pulseaudio-module-x11-publish \
173 pulseaudio-module-x11-xsmp \
174 ', '', d)}"