diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:53 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:39 +0200 |
commit | ab9f4d9ab21199278ac868378a8566eeeeac4090 (patch) | |
tree | 52e1535393fb10c5ddf5364c5960cea2add66659 /meta-multimedia/recipes-mediacentre | |
parent | f08b75f64ccf52c416a2ebaeb2e27d1e50877583 (diff) | |
download | meta-openembedded-ab9f4d9ab21199278ac868378a8566eeeeac4090.tar.gz |
meta-multimedia: use bb.utils.contains() instead of base_contains()
base_contains() is 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: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-mediacentre')
-rw-r--r-- | meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb index 17db7b51e..f14d4e1cf 100644 --- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb +++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb | |||
@@ -33,7 +33,7 @@ CACHED_CONFIGUREVARS += " \ | |||
33 | ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ | 33 | ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ |
34 | " | 34 | " |
35 | 35 | ||
36 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}" | 36 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}" |
37 | PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew" | 37 | PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew" |
38 | PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl," | 38 | PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl," |
39 | 39 | ||
@@ -43,7 +43,7 @@ EXTRA_OECONF = " \ | |||
43 | --enable-airplay \ | 43 | --enable-airplay \ |
44 | --disable-optical-drive \ | 44 | --disable-optical-drive \ |
45 | --enable-external-libraries \ | 45 | --enable-external-libraries \ |
46 | ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \ | 46 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \ |
47 | " | 47 | " |
48 | 48 | ||
49 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" | 49 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" |
@@ -94,6 +94,6 @@ RRECOMMENDS_${PN}_append = " libcec \ | |||
94 | python-netclient \ | 94 | python-netclient \ |
95 | libcurl \ | 95 | libcurl \ |
96 | xdpyinfo \ | 96 | xdpyinfo \ |
97 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \ | 97 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \ |
98 | " | 98 | " |
99 | RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850" | 99 | RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850" |