aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-10-05 16:59:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-07 13:13:28 +0100
commit0730d3449aa28600488e73de883240ba2bd60aec (patch)
tree63e26dd41a7de4c827bfcc81479e9141284afe33 /meta/recipes-multimedia/pulseaudio/pulseaudio.inc
parent4f2a290cbcc6c21afbb2a6e6148efdef4d135b41 (diff)
downloadopenembedded-core-contrib-0730d3449aa28600488e73de883240ba2bd60aec.tar.gz
openembedded-core-contrib-0730d3449aa28600488e73de883240ba2bd60aec.tar.bz2
openembedded-core-contrib-0730d3449aa28600488e73de883240ba2bd60aec.zip
pulseaudio: ensure X11 and consolekit are disabled
When DISTRO_FEATURES does not include X11 ensure that both x11 and gtk are diabled correctly. ConsoleKit also has x11, so ensure that any RDEPENDS is also excluded. The flags for x11 changed at somepoint to use enable/disable, but this recipe was not updated. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio/pulseaudio.inc')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 753b013cd4..3003eaa3ac 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -27,7 +27,7 @@ EXTRA_OECONF = "\
--disable-lynx \
${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
--disable-polkit \
- ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '--disable-x11 --disable-gtk2', d)} \
--without-jack \
--with-glib \
--with-alsa \
@@ -117,7 +117,6 @@ python populate_packages_prepend() {
do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
}
-RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
RDEPENDS_pulseaudio-server = " \
pulseaudio-module-filter-apply \
pulseaudio-module-filter-heuristics \
@@ -137,7 +136,9 @@ RDEPENDS_pulseaudio-server = " \
pulseaudio-module-rescue-streams \
pulseaudio-module-always-sink \
pulseaudio-module-suspend-on-idle \
- pulseaudio-module-console-kit \
pulseaudio-module-position-event-sounds \
pulseaudio-module-role-cork "
+RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
+RDEPENDS_pulseaudio-server += "\
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}"