summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorPau Espin Pedrol <pau.espin@aweurope.be>2015-07-30 13:33:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:30 -0700
commitf0ad4ce3c72a8698d39ec26919d36e03505b9b86 (patch)
tree5056a5da548d9d083bda98ebb7b92c10e20db96b /meta/recipes-multimedia/pulseaudio
parent3255d0042e8440f044212b3110d5528f8a355362 (diff)
downloadpoky-f0ad4ce3c72a8698d39ec26919d36e03505b9b86.tar.gz
pulseaudio: Add systemd to PACKAGECONFIG if enabled in DISTRO_FEATURES
(From OE-Core rev: 4b85870619102167ad80d7f919f16c226de72f9d) Signed-off-by: Pau Espin Pedrol <pau.espin@aweurope.be> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 1a9d33a7e8..3389ec9916 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -35,7 +35,10 @@ EXTRA_OECONF = "\
35PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 35PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
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)} \
40 "
41
39PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" 42PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
40PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 43PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
41PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" 44PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono"
@@ -94,7 +97,7 @@ FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
94FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" 97FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake"
95FILES_${PN}-conf = "${sysconfdir}" 98FILES_${PN}-conf = "${sysconfdir}"
96FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse" 99FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
97FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules" 100FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules ${systemd_user_unitdir}/*"
98 101
99#SYSTEMD_PACKAGES = "${PN}-server" 102#SYSTEMD_PACKAGES = "${PN}-server"
100SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" 103SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service"