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-graphics/libsdl2 | |
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-graphics/libsdl2')
-rw-r--r-- | meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb index 7958f7b985..fa19566162 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb | |||
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0605ca7e995ab1217e0bb988731a87fe" | |||
12 | 12 | ||
13 | PROVIDES = "virtual/libsdl2" | 13 | PROVIDES = "virtual/libsdl2" |
14 | 14 | ||
15 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | 15 | DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ |
16 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ | 16 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ |
17 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ |
18 | tslib" | 18 | tslib" |
19 | DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" | 19 | DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" |
20 | 20 | ||
21 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ | 21 | SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ |
22 | " | 22 | " |
@@ -32,14 +32,14 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ | |||
32 | --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ | 32 | --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ |
33 | --disable-video-dummy \ | 33 | --disable-video-dummy \ |
34 | --enable-input-tslib --enable-pthreads \ | 34 | --enable-input-tslib --enable-pthreads \ |
35 | ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ | 35 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ |
36 | ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ | 36 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ |
37 | ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ | 37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ |
38 | --enable-sdl-dlopen \ | 38 | --enable-sdl-dlopen \ |
39 | --disable-rpath \ | 39 | --disable-rpath \ |
40 | --disable-pulseaudio" | 40 | --disable-pulseaudio" |
41 | 41 | ||
42 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 42 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" |
43 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," | 43 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," |
44 | 44 | ||
45 | PARALLEL_MAKE = "" | 45 | PARALLEL_MAKE = "" |