diff options
author | Ross Burton <ross.burton@intel.com> | 2016-05-16 13:47:14 +0100 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-05-16 09:50:20 -0500 |
commit | d87917772ca9597ddd19c8b743212b8dae434b41 (patch) | |
tree | c1c4170d1d17665d8e0f568a7306dc6d6995e419 /common/recipes-multimedia | |
parent | 48a09d7e7050f9448368285a0521673b8004c7a1 (diff) | |
download | meta-intel-d87917772ca9597ddd19c8b743212b8dae434b41.tar.gz |
recipes: use bb.utils.contains instead of base_contains
base_contains is simply a compatibility wrapper and may warn in the future, so
replace all instances with bb.utils.contains().
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'common/recipes-multimedia')
4 files changed, 8 insertions, 8 deletions
diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc index 6683a7b0..7a298902 100644 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc +++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc | |||
@@ -23,9 +23,9 @@ PACKAGES =+ "${PN}-tests" | |||
23 | EXTRA_OECONF += "--disable-builtin-libvpx" | 23 | EXTRA_OECONF += "--disable-builtin-libvpx" |
24 | 24 | ||
25 | PACKAGECONFIG ??= "drm \ | 25 | PACKAGECONFIG ??= "drm \ |
26 | ${@base_contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ | 26 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ |
27 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ | 27 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \ |
28 | ${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)}" | 28 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)}" |
29 | 29 | ||
30 | PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" | 30 | PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" |
31 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" | 31 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/mesa" |
diff --git a/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb b/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb index 118d20b8..403329bc 100644 --- a/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb +++ b/common/recipes-multimedia/libva/libva-intel-driver_1.7.0.bb | |||
@@ -20,8 +20,8 @@ SRC_URI[sha256sum] = "9d19d6c789a9a4fbce23c4f0eaf993ba776b512bec4c87982ab17ac841 | |||
20 | 20 | ||
21 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
22 | 22 | ||
23 | PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 23 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ |
24 | ${@base_contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}" | 24 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "wayland", "", d)}" |
25 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11" | 25 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11" |
26 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland virtual/egl" | 26 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland virtual/egl" |
27 | 27 | ||
diff --git a/common/recipes-multimedia/libva/libva_1.7.0.bb b/common/recipes-multimedia/libva/libva_1.7.0.bb index 6cb59eb6..d6eb1edb 100644 --- a/common/recipes-multimedia/libva/libva_1.7.0.bb +++ b/common/recipes-multimedia/libva/libva_1.7.0.bb | |||
@@ -28,8 +28,8 @@ inherit autotools pkgconfig | |||
28 | 28 | ||
29 | EXTRA_OECONF = "--disable-dummy-driver" | 29 | EXTRA_OECONF = "--disable-dummy-driver" |
30 | 30 | ||
31 | PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 31 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ |
32 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | 32 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" |
33 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" | 33 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" |
34 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" | 34 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" |
35 | 35 | ||
diff --git a/common/recipes-multimedia/libva/va-intel.bb b/common/recipes-multimedia/libva/va-intel.bb index 93df94d2..0c90148f 100644 --- a/common/recipes-multimedia/libva/va-intel.bb +++ b/common/recipes-multimedia/libva/va-intel.bb | |||
@@ -7,7 +7,7 @@ PR = "r1" | |||
7 | 7 | ||
8 | def map_valibs(d): | 8 | def map_valibs(d): |
9 | # The intel implementation requires the libva-intel-driver package | 9 | # The intel implementation requires the libva-intel-driver package |
10 | if base_contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1": | 10 | if bb.utils.contains('MACHINE_FEATURES', 'va-impl-intel', "1", "0", d) == "1": |
11 | return "libva libva-intel-driver" | 11 | return "libva libva-intel-driver" |
12 | # All meta-intel video acceleration requires libva | 12 | # All meta-intel video acceleration requires libva |
13 | return "libva" | 13 | return "libva" |