diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-multimedia/gstreamer | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-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/gstreamer')
8 files changed, 14 insertions, 14 deletions
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" | |||
21 | ALLOW_EMPTY_gst-meta-video = "1" | 21 | ALLOW_EMPTY_gst-meta-video = "1" |
22 | 22 | ||
23 | RDEPENDS_gst-meta-base = "\ | 23 | RDEPENDS_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 | ||
19 | PACKAGECONFIG ??= "bzip curl \ | 19 | PACKAGECONFIG ??= "bzip curl \ |
20 | ${@base_contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}" | 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}" |
21 | 21 | ||
22 | PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2" | 22 | PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2" |
23 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" | 23 | PACKAGECONFIG[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 | ||
21 | EXTRA_OECONF += "--disable-freetypetest" | 21 | EXTRA_OECONF += "--disable-freetypetest" |
22 | 22 | ||
23 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 23 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
24 | 24 | ||
25 | PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" | 25 | PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" |
26 | PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" | 26 | PACKAGECONFIG[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 | ||
8 | PR = "r8" | 8 | PR = "r8" |
9 | 9 | ||
10 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg" | 10 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg" |
11 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" | 11 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" |
12 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" | 12 | PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" |
13 | PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" | 13 | PACKAGECONFIG[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" | |||
19 | ALLOW_EMPTY_gstreamer1.0-meta-video = "1" | 19 | ALLOW_EMPTY_gstreamer1.0-meta-video = "1" |
20 | 20 | ||
21 | RDEPENDS_gstreamer1.0-meta-base = "\ | 21 | RDEPENDS_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 | ||
12 | PACKAGECONFIG ??= " \ | 12 | PACKAGECONFIG ??= " \ |
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 | ||
3 | LICENSE = "GPLv2+ & LGPLv2+" | 3 | LICENSE = "GPLv2+ & LGPLv2+" |
4 | 4 | ||
5 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" | 5 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" |
6 | DEPENDS += "freetype liboil util-linux" | 6 | DEPENDS += "freetype liboil util-linux" |
7 | 7 | ||
8 | inherit gettext | 8 | inherit gettext |
@@ -10,8 +10,8 @@ inherit gettext | |||
10 | PACKAGES_DYNAMIC =+ "^libgst.*" | 10 | PACKAGES_DYNAMIC =+ "^libgst.*" |
11 | 11 | ||
12 | PACKAGECONFIG ??= " \ | 12 | PACKAGECONFIG ??= " \ |
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 | ||
11 | PACKAGECONFIG ??= " \ | 11 | PACKAGECONFIG ??= " \ |
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 | ||