diff options
Diffstat (limited to 'meta/recipes-graphics')
19 files changed, 49 insertions, 49 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index b15fbc94b9..c0af1e3632 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc | |||
@@ -13,8 +13,8 @@ LICENSE = "MPL-1 & LGPLv2.1" | |||
13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" | 13 | X11DEPENDS = "virtual/libx11 libsm libxrender libxext" |
14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" | 14 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" |
15 | 15 | ||
16 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
17 | ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" |
18 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" | 18 | PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" |
19 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" | 19 | PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" |
20 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" | 20 | PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" |
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 3ca19b34cb..77035d746f 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc | |||
@@ -33,8 +33,8 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E | |||
33 | PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" | 33 | PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" |
34 | 34 | ||
35 | # Default configuration, distros might want to override | 35 | # Default configuration, distros might want to override |
36 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ | 36 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ |
37 | ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" | 37 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" |
38 | 38 | ||
39 | FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" | 39 | FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" |
40 | FILES_${PN}-examples = "${libdir}/clutter/examples" | 40 | FILES_${PN}-examples = "${libdir}/clutter/examples" |
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 15bfea26bc..a4a85506ff 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc | |||
@@ -53,8 +53,8 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" | |||
53 | # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by | 53 | # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by |
54 | # default. | 54 | # default. |
55 | PACKAGECONFIG ??= "cogl-pango gles2 \ | 55 | PACKAGECONFIG ??= "cogl-pango gles2 \ |
56 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ | 56 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ |
57 | ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" | 57 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" |
58 | 58 | ||
59 | FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" | 59 | FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" |
60 | FILES_libcogl = "${libdir}/libcogl${SOLIBS}" | 60 | FILES_libcogl = "${libdir}/libcogl${SOLIBS}" |
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index e19c3882ad..4a7712116f 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" | |||
12 | 12 | ||
13 | PROVIDES = "virtual/libsdl" | 13 | PROVIDES = "virtual/libsdl" |
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 libglu', '', d)} \ | 16 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', 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 | PR = "r3" | 21 | PR = "r3" |
22 | 22 | ||
@@ -39,15 +39,15 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers | |||
39 | --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ | 39 | --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ |
40 | --disable-xbios --disable-gem --disable-video-dummy \ | 40 | --disable-xbios --disable-gem --disable-video-dummy \ |
41 | --enable-input-events --enable-input-tslib --enable-pthreads \ | 41 | --enable-input-events --enable-input-tslib --enable-pthreads \ |
42 | ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ |
43 | ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ |
44 | ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ |
45 | --disable-video-svga \ | 45 | --disable-video-svga \ |
46 | --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ | 46 | --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ |
47 | --disable-rpath \ | 47 | --disable-rpath \ |
48 | --disable-pulseaudio" | 48 | --disable-pulseaudio" |
49 | 49 | ||
50 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" | 50 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" |
51 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," | 51 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," |
52 | 52 | ||
53 | PARALLEL_MAKE = "" | 53 | PARALLEL_MAKE = "" |
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 = "" |
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb index 4bb92f4b05..d6e6fbceb1 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | |||
@@ -22,10 +22,10 @@ SRC_URI[sha256sum] = "9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a | |||
22 | inherit autotools pkgconfig | 22 | inherit autotools pkgconfig |
23 | 23 | ||
24 | PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ | 24 | PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ |
25 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 25 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
26 | 26 | ||
27 | # The Wayland code doesn't work with Wayland 1.0, so disable it for now | 27 | # The Wayland code doesn't work with Wayland 1.0, so disable it for now |
28 | #${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" | 28 | #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" |
29 | 29 | ||
30 | PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" | 30 | PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" |
31 | PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" | 31 | PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" |
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb index 21f6151f29..8c7d8e8d63 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb | |||
@@ -6,6 +6,6 @@ FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}", "${FILE_DIRNAM | |||
6 | 6 | ||
7 | PROVIDES = "virtual/libgl virtual/mesa" | 7 | PROVIDES = "virtual/libgl virtual/mesa" |
8 | 8 | ||
9 | PACKAGECONFIG ??= "dri ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 9 | PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
10 | 10 | ||
11 | EXCLUDE_FROM_WORLD = "1" | 11 | EXCLUDE_FROM_WORLD = "1" |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 96313b5da5..a33b7b52a0 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -26,8 +26,8 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
26 | EXTRA_OECONF = "--enable-shared-glapi" | 26 | EXTRA_OECONF = "--enable-shared-glapi" |
27 | 27 | ||
28 | PACKAGECONFIG ??= "egl gles dri \ | 28 | PACKAGECONFIG ??= "egl gles dri \ |
29 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ | 29 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ |
30 | ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ | 30 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ |
31 | " | 31 | " |
32 | 32 | ||
33 | X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" | 33 | X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" |
@@ -45,18 +45,18 @@ EXTRA_OECONF += "--enable-gbm" | |||
45 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" | 45 | PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" |
46 | 46 | ||
47 | EGL_PLATFORMS = "drm" | 47 | EGL_PLATFORMS = "drm" |
48 | EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" | 48 | EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" |
49 | EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" | 49 | EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" |
50 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" | 50 | PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" |
51 | 51 | ||
52 | PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" | 52 | PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" |
53 | 53 | ||
54 | GALLIUMDRIVERS = "swrast" | 54 | GALLIUMDRIVERS = "swrast" |
55 | GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" | 55 | GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" |
56 | GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" | 56 | GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" |
57 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" | 57 | GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" |
58 | GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | 58 | GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" |
59 | GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" | 59 | GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" |
60 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers | 60 | # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers |
61 | PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" | 61 | PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" |
62 | PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" | 62 | PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" |
diff --git a/meta/recipes-graphics/mesa/mesa_9.2.5.bb b/meta/recipes-graphics/mesa/mesa_9.2.5.bb index 737ed1a6cb..02ecd463e6 100644 --- a/meta/recipes-graphics/mesa/mesa_9.2.5.bb +++ b/meta/recipes-graphics/mesa/mesa_9.2.5.bb | |||
@@ -13,7 +13,7 @@ S = "${WORKDIR}/Mesa-${PV}" | |||
13 | #because we cannot rely on the fact that all apps will use pkgconfig, | 13 | #because we cannot rely on the fact that all apps will use pkgconfig, |
14 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | 14 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |
15 | do_install_append() { | 15 | do_install_append() { |
16 | if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then | 16 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then |
17 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h | 17 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h |
18 | fi | 18 | fi |
19 | } | 19 | } |
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index 0abedbcb83..1e6fdb5cf0 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb | |||
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git" | |||
18 | #because we cannot rely on the fact that all apps will use pkgconfig, | 18 | #because we cannot rely on the fact that all apps will use pkgconfig, |
19 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER | 19 | #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER |
20 | do_install_append() { | 20 | do_install_append() { |
21 | if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then | 21 | if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then |
22 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h | 22 | sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h |
23 | fi | 23 | fi |
24 | } | 24 | } |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb index 334a17e668..7786133930 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "MIT" | |||
3 | 3 | ||
4 | inherit packagegroup | 4 | inherit packagegroup |
5 | 5 | ||
6 | TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' | 6 | TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' |
7 | 7 | ||
8 | RDEPENDS_${PN} = " \ | 8 | RDEPENDS_${PN} = " \ |
9 | directfb \ | 9 | directfb \ |
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 4a20d207ba..4f7931553f 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc | |||
@@ -12,7 +12,7 @@ LICENSE = "LGPLv2.0+" | |||
12 | X11DEPENDS = "virtual/libx11 libxft" | 12 | X11DEPENDS = "virtual/libx11 libxft" |
13 | DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" | 13 | DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" |
14 | 14 | ||
15 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 15 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
16 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" | 16 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" |
17 | 17 | ||
18 | BBCLASSEXTEND = "native" | 18 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb index 521316659c..afdc49c9b9 100644 --- a/meta/recipes-graphics/wayland/weston_1.4.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb | |||
@@ -28,9 +28,9 @@ EXTRA_OECONF = "--enable-setuid-install \ | |||
28 | --disable-rdp-compositor" | 28 | --disable-rdp-compositor" |
29 | 29 | ||
30 | 30 | ||
31 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ | 31 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ |
32 | ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ |
33 | ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ | 33 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ |
34 | " | 34 | " |
35 | # | 35 | # |
36 | # Compositor choices | 36 | # Compositor choices |
@@ -59,7 +59,7 @@ do_install_append() { | |||
59 | rm -f ${D}/${libdir}/weston/*.la | 59 | rm -f ${D}/${libdir}/weston/*.la |
60 | 60 | ||
61 | # If X11, ship a desktop file to launch it | 61 | # If X11, ship a desktop file to launch it |
62 | if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then | 62 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then |
63 | install -d ${D}${datadir}/applications | 63 | install -d ${D}${datadir}/applications |
64 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | 64 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications |
65 | 65 | ||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index e4508a917d..0a16ff5f83 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb | |||
@@ -22,7 +22,7 @@ do_install() { | |||
22 | install -d ${D}${sysconfdir}/init.d | 22 | install -d ${D}${sysconfdir}/init.d |
23 | install xserver-nodm ${D}${sysconfdir}/init.d | 23 | install xserver-nodm ${D}${sysconfdir}/init.d |
24 | 24 | ||
25 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 25 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
26 | install -d ${D}${sysconfdir}/default | 26 | install -d ${D}${sysconfdir}/default |
27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm | 27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm |
28 | install -d ${D}${systemd_unitdir}/system | 28 | install -d ${D}${systemd_unitdir}/system |
@@ -36,7 +36,7 @@ do_install() { | |||
36 | fi | 36 | fi |
37 | fi | 37 | fi |
38 | 38 | ||
39 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 39 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
40 | if [ "${ROOTLESS_X}" = "1" ] ; then | 40 | if [ "${ROOTLESS_X}" = "1" ] ; then |
41 | install -d ${D}${sysconfdir}/X11 | 41 | install -d ${D}${sysconfdir}/X11 |
42 | install Xusername ${D}${sysconfdir}/X11 | 42 | install Xusername ${D}${sysconfdir}/X11 |
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb index 9785a162e0..3d98172442 100644 --- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | |||
@@ -18,6 +18,6 @@ DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdama | |||
18 | 18 | ||
19 | inherit autotools-brokensep | 19 | inherit autotools-brokensep |
20 | 20 | ||
21 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" | 21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" |
22 | PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" | 22 | PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" |
23 | PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" | 23 | PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" |
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb index 78edd5a5c5..cd8fd63b51 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb | |||
@@ -15,7 +15,7 @@ SRC_URI += "file://disable-dri2-tests.patch \ | |||
15 | file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ | 15 | file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" | 18 | PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" |
19 | 19 | ||
20 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" | 20 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" |
21 | PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" | 21 | PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" |
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb index b74d1741cc..60eace46d4 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb | |||
@@ -14,7 +14,7 @@ DEPENDS += "virtual/libx11 drm libpciaccess pixman" | |||
14 | SRC_URI += "file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ | 14 | SRC_URI += "file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" | 17 | PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" |
18 | 18 | ||
19 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" | 19 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" |
20 | PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" | 20 | PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" |
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb index 1a687c8ed6..cf5dfeb778 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb | |||
@@ -16,5 +16,5 @@ inherit autotools pkgconfig | |||
16 | 16 | ||
17 | EXTRA_OECONF = "--disable-docs" | 17 | EXTRA_OECONF = "--disable-docs" |
18 | 18 | ||
19 | PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 19 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
20 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb" | 20 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 2bacbe51da..2e83d53690 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -116,7 +116,7 @@ EXTRA_OECONF += "--with-fop=no \ | |||
116 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ | 116 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ |
117 | " | 117 | " |
118 | 118 | ||
119 | PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" | 119 | PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" |
120 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | 120 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" |
121 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" | 121 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" |
122 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" | 122 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" |