summaryrefslogtreecommitdiffstats
path: root/meta
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:14:59 +0100
commit5e1f39e998b2cbc9229793c9d696ff8ad9c96baa (patch)
tree14f3ad516706b9c359e34050a718475b98e14516 /meta
parentd3b08b42725b7208c4da3fcb059d3b7863fc56ba (diff)
downloadpoky-5e1f39e998b2cbc9229793c9d696ff8ad9c96baa.tar.gz
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. (From OE-Core rev: 0730d3449aa28600488e73de883240ba2bd60aec) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc7
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb2
2 files changed, 5 insertions, 4 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 = "\
27 --disable-lynx \ 27 --disable-lynx \
28 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \ 28 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
29 --disable-polkit \ 29 --disable-polkit \
30 ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \ 30 ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '--disable-x11 --disable-gtk2', d)} \
31 --without-jack \ 31 --without-jack \
32 --with-glib \ 32 --with-glib \
33 --with-alsa \ 33 --with-alsa \
@@ -117,7 +117,6 @@ python populate_packages_prepend() {
117 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' ) 117 do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s', 'PulseAudio library for %s', extra_depends='' )
118} 118}
119 119
120RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
121RDEPENDS_pulseaudio-server = " \ 120RDEPENDS_pulseaudio-server = " \
122 pulseaudio-module-filter-apply \ 121 pulseaudio-module-filter-apply \
123 pulseaudio-module-filter-heuristics \ 122 pulseaudio-module-filter-heuristics \
@@ -137,7 +136,9 @@ RDEPENDS_pulseaudio-server = " \
137 pulseaudio-module-rescue-streams \ 136 pulseaudio-module-rescue-streams \
138 pulseaudio-module-always-sink \ 137 pulseaudio-module-always-sink \
139 pulseaudio-module-suspend-on-idle \ 138 pulseaudio-module-suspend-on-idle \
140 pulseaudio-module-console-kit \
141 pulseaudio-module-position-event-sounds \ 139 pulseaudio-module-position-event-sounds \
142 pulseaudio-module-role-cork " 140 pulseaudio-module-role-cork "
143 141
142RDEPENDS_pulseaudio-module-console-kit =+ "consolekit"
143RDEPENDS_pulseaudio-server += "\
144 ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
index 947aa6ded6..1c2c9f7976 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_2.1.bb
@@ -1,6 +1,6 @@
1require pulseaudio.inc 1require pulseaudio.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5DEPENDS += "libjson gdbm speex libxml-parser-perl-native" 5DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
6 6