summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-08-28 18:07:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-01 11:44:01 +0100
commit8c40147eb1f0e8c40c6dff95eb60e31bffbb2335 (patch)
treed34e3c5d2875d440d3a001284d65bc63d437cede
parentb9cdd11c9929e3d75ce380d978e6142b5b623e74 (diff)
downloadpoky-8c40147eb1f0e8c40c6dff95eb60e31bffbb2335.tar.gz
pulseaudio: improve PACKAGECONFIG for dbus/consolekit dependencies
* the problem is that consolekit module is built whenever dbus is enabled and consolekit is available only in distributions with x11 in DISTRO_FEATURES * many distributions want to enable dbus support (required for bluez support), but without consolekit because they aren't using x11 * allow to completely disable dbus (and consolekit) * add consolekit runtime dependency only for x11 in DISTRO_FEATURES (From OE-Core rev: 8944259ceacf65ede66a41a8939b6ed568363f24) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a098473878..47f5f390c0 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
9 9
10DEPENDS = "libatomic-ops liboil libsndfile1 libtool" 10DEPENDS = "libatomic-ops liboil libsndfile1 libtool"
11# optional 11# optional
12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" 12DEPENDS += "udev alsa-lib glib-2.0 gconf"
13DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap" 13DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap"
14 14
15inherit autotools pkgconfig useradd gettext perlnative bluetooth systemd 15inherit autotools pkgconfig useradd gettext perlnative bluetooth systemd
@@ -37,8 +37,10 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ
37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
38 ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ 38 ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \
39 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 39 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
40 dbus \
40 " 41 "
41 42
43PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
42PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" 44PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
43PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 45PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
44PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" 46PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono"
@@ -75,7 +77,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
75# adding the console-kit module to an image, we also get the necessary 77# adding the console-kit module to an image, we also get the necessary
76# consolekit package produced. 78# consolekit package produced.
77PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ 79PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \
78 pulseaudio-server pulseaudio-misc ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}" 80 pulseaudio-server pulseaudio-misc ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'pulseaudio-module-console-kit', '', d)}"
79 81
80#upgrade path: 82#upgrade path:
81RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" 83RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
@@ -157,7 +159,9 @@ RDEPENDS_pulseaudio-server = " \
157# that makes the PulseAudio plugin the default ALSA device. 159# that makes the PulseAudio plugin the default ALSA device.
158RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf" 160RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf"
159 161
160RDEPENDS_pulseaudio-module-console-kit =+ "consolekit" 162# pulseaudio-module-console-kit is built whenever dbus is enabled by PACKAGECONFIG
163# but consolekit depends on libx11 and is available only for DISTRO with x11 in DISTRO_FEATURES
164RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
161RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" 165RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
162 166
163FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" 167FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"