diff options
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 217673163c..195a98296d 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -31,10 +31,10 @@ EXTRA_OECONF = "\ | |||
31 | ac_cv_header_valgrind_memcheck_h=no \ | 31 | ac_cv_header_valgrind_memcheck_h=no \ |
32 | " | 32 | " |
33 | 33 | ||
34 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ | 34 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ |
35 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 35 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
36 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 36 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
37 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
38 | PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" | 38 | PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" |
39 | PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" | 39 | PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" |
40 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" | 40 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" |
@@ -74,7 +74,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \ | |||
74 | # adding the console-kit module to an image, we also get the necessary | 74 | # adding the console-kit module to an image, we also get the necessary |
75 | # consolekit package produced. | 75 | # consolekit package produced. |
76 | PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ | 76 | PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ |
77 | pulseaudio-server pulseaudio-misc ${@base_contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}" | 77 | pulseaudio-server pulseaudio-misc ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}" |
78 | 78 | ||
79 | #upgrade path: | 79 | #upgrade path: |
80 | RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" | 80 | RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" |
@@ -148,4 +148,4 @@ FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" | |||
148 | FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" | 148 | FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" |
149 | 149 | ||
150 | RDEPENDS_pulseaudio-server += "\ | 150 | RDEPENDS_pulseaudio-server += "\ |
151 | ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}" | 151 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}" |