summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-multimedia
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb4
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc6
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc4
-rw-r--r--meta/recipes-multimedia/libav/libav.inc2
-rw-r--r--meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb2
-rw-r--r--meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb2
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc12
14 files changed, 26 insertions, 26 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
index 4f64a387ec..dfa9b97017 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ 11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
12 file://mips_has_no_io_h.patch \ 12 file://mips_has_no_io_h.patch \
13 file://autotools.patch \ 13 file://autotools.patch \
14 ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}" 14 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
15 15
16SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" 16SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
17SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" 17SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
@@ -20,7 +20,7 @@ inherit autotools-brokensep
20 20
21EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" 21EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'"
22 22
23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" 23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
24PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," 24PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
25 25
26# configure.ac/.in doesn't exist so force copy 26# configure.ac/.in doesn't exist so force copy
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
index 056fca2dac..2edacc1b1b 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
@@ -86,7 +86,7 @@ do_install() {
86 # See alsa-utils-alsaconf_${PV}.bb 86 # See alsa-utils-alsaconf_${PV}.bb
87 rm ${D}${sbindir}/alsaconf 87 rm ${D}${sbindir}/alsaconf
88 88
89 if ${@base_contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then 89 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
90 # This is where alsa-utils will install its rules if we don't tell it anything else. 90 # This is where alsa-utils will install its rules if we don't tell it anything else.
91 rm -rf ${D}/lib/udev 91 rm -rf ${D}/lib/udev
92 rmdir --ignore-fail-on-non-empty ${D}/lib 92 rmdir --ignore-fail-on-non-empty ${D}/lib
diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 9fb2f8fbb3..518ab721af 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -21,7 +21,7 @@ ALLOW_EMPTY_gst-meta-debug = "1"
21ALLOW_EMPTY_gst-meta-video = "1" 21ALLOW_EMPTY_gst-meta-video = "1"
22 22
23RDEPENDS_gst-meta-base = "\ 23RDEPENDS_gst-meta-base = "\
24 ${@base_contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \
25 gstreamer \ 25 gstreamer \
26 gst-plugins-base-playbin \ 26 gst-plugins-base-playbin \
27 gst-plugins-base-decodebin \ 27 gst-plugins-base-decodebin \
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
index dceb12cf2a..a26acefb25 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF += "--disable-experimental \
17 --disable-vdpau --disable-apexsink" 17 --disable-vdpau --disable-apexsink"
18 18
19PACKAGECONFIG ??= "bzip curl \ 19PACKAGECONFIG ??= "bzip curl \
20 ${@base_contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}" 20 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}"
21 21
22PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2" 22PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2"
23PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 23PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 53cc55cc26..83b856b110 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -20,7 +20,7 @@ inherit gettext
20 20
21EXTRA_OECONF += "--disable-freetypetest" 21EXTRA_OECONF += "--disable-freetypetest"
22 22
23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
24 24
25PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" 25PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs"
26PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" 26PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index e0443406a0..c87e0182da 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 7
8PR = "r8" 8PR = "r8"
9 9
10PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg" 10PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg"
11PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" 11PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
12PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 12PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
13PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" 13PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
index cb8dd1ac5f..a703d9b7a4 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
@@ -19,7 +19,7 @@ ALLOW_EMPTY_gstreamer1.0-meta-debug = "1"
19ALLOW_EMPTY_gstreamer1.0-meta-video = "1" 19ALLOW_EMPTY_gstreamer1.0-meta-video = "1"
20 20
21RDEPENDS_gstreamer1.0-meta-base = "\ 21RDEPENDS_gstreamer1.0-meta-base = "\
22 ${@base_contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \
23 gstreamer1.0 \ 23 gstreamer1.0 \
24 gstreamer1.0-plugins-base-playback \ 24 gstreamer1.0-plugins-base-playback \
25 gstreamer1.0-plugins-base-gio \ 25 gstreamer1.0-plugins-base-gio \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 08440a2536..ceb2de1917 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -10,10 +10,10 @@ inherit gettext
10 10
11 11
12PACKAGECONFIG ??= " \ 12PACKAGECONFIG ??= " \
13 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \
15 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 15 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
17 orc curl uvch264 neon \ 17 orc curl uvch264 neon \
18 hls sbc dash bz2 smoothstreaming \ 18 hls sbc dash bz2 smoothstreaming \
19 " 19 "
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index b56c506486..eb132775c6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -2,7 +2,7 @@ require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4 4
5DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" 5DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
6DEPENDS += "freetype liboil util-linux" 6DEPENDS += "freetype liboil util-linux"
7 7
8inherit gettext 8inherit gettext
@@ -10,8 +10,8 @@ inherit gettext
10PACKAGES_DYNAMIC =+ "^libgst.*" 10PACKAGES_DYNAMIC =+ "^libgst.*"
11 11
12PACKAGECONFIG ??= " \ 12PACKAGECONFIG ??= " \
13 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
15 orc ivorbis ogg theora vorbis \ 15 orc ivorbis ogg theora vorbis \
16 " 16 "
17 17
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 06de4da5dd..5e313ef378 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -9,8 +9,8 @@ inherit gettext
9 9
10 10
11PACKAGECONFIG ??= " \ 11PACKAGECONFIG ??= " \
12 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
13 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
14 orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ 14 orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \
15 " 15 "
16 16
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index 2152936dc7..a05a2a6601 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -23,7 +23,7 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
23EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" 23EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
24EXTRA_FFCONF ?= "" 24EXTRA_FFCONF ?= ""
25 25
26PACKAGECONFIG ??= "bzip2 x264 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 26PACKAGECONFIG ??= "bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
27PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" 27PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
28PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" 28PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
29PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" 29PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
index fe0e39721c..924629873e 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
15 15
16S = "${WORKDIR}/libsndfile-${PV}" 16S = "${WORKDIR}/libsndfile-${PV}"
17 17
18PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 18PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
19PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 19PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
20 20
21EXTRA_OECONF = "--disable-external-libs" 21EXTRA_OECONF = "--disable-external-libs"
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index aee2f3be48..12112842c3 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -6,7 +6,7 @@ LICENSE_FLAGS = "commercial"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154" 7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
8 8
9DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" 9DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
10 10
11PR = "r2" 11PR = "r2"
12 12
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
34PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ 34PACKAGECONFIG ??= "${@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)}"
38PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" 38PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
39PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 39PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
40PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" 40PACKAGECONFIG[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.
76PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ 76PACKAGES =+ "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:
80RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" 80RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
@@ -148,4 +148,4 @@ FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
148FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 148FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
149 149
150RDEPENDS_pulseaudio-server += "\ 150RDEPENDS_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)}"