diff options
Diffstat (limited to 'meta/recipes-graphics')
20 files changed, 25 insertions, 35 deletions
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 597b58290a..8e1e2e1b88 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc | |||
@@ -22,7 +22,7 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext" | |||
22 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" | 22 | DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" |
23 | 23 | ||
24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ | 24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ |
25 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" | 25 | ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}" |
26 | 26 | ||
27 | PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" | 27 | PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" |
28 | PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" | 28 | PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" |
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index c6ecd0804c..6dbbf4d803 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc | |||
@@ -35,7 +35,7 @@ PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayla | |||
35 | 35 | ||
36 | # Default configuration, distros might want to override | 36 | # Default configuration, distros might want to override |
37 | PACKAGECONFIG ??= "egl \ | 37 | PACKAGECONFIG ??= "egl \ |
38 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ | 38 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ |
39 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" | 39 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" |
40 | 40 | ||
41 | FILES_${PN}-examples = "${libdir}/clutter/examples" | 41 | FILES_${PN}-examples = "${libdir}/clutter/examples" |
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb index 4d52f126ff..bd0148e3e7 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.0.bb | |||
@@ -16,4 +16,4 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
16 | DEPENDS = "util-macros virtual/egl" | 16 | DEPENDS = "util-macros virtual/egl" |
17 | 17 | ||
18 | PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" | 18 | PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" |
19 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 9c0ec541e3..c802a6f692 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -41,13 +41,10 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers | |||
41 | --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ | 41 | --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ |
42 | --disable-rpath" | 42 | --disable-rpath" |
43 | 43 | ||
44 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 44 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ |
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}" |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | ||
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ | ||
48 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
49 | PACKAGECONFIG_class-native = "x11" | 46 | PACKAGECONFIG_class-native = "x11" |
50 | PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 47 | PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
51 | 48 | ||
52 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib" | 49 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib" |
53 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" | 50 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" |
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb index 0d9a12993f..d747cf18f0 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb | |||
@@ -38,15 +38,12 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ | |||
38 | 38 | ||
39 | # opengl packageconfig factored out to make it easy for distros | 39 | # opengl packageconfig factored out to make it easy for distros |
40 | # and BSP layers to pick either (desktop) opengl, gles2, or no GL | 40 | # and BSP layers to pick either (desktop) opengl, gles2, or no GL |
41 | PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}" | 41 | PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" |
42 | 42 | ||
43 | PACKAGECONFIG ??= " \ | 43 | PACKAGECONFIG ??= " \ |
44 | ${PACKAGECONFIG_GL} \ | 44 | ${PACKAGECONFIG_GL} \ |
45 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 45 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ |
46 | ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ | ||
47 | ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | ||
48 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ | 46 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ |
49 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
50 | " | 47 | " |
51 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," | 48 | PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," |
52 | PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" | 49 | PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" |
diff --git a/meta/recipes-graphics/libva/libva_1.7.3.bb b/meta/recipes-graphics/libva/libva_1.7.3.bb index 5c74fa628b..627b39a90f 100644 --- a/meta/recipes-graphics/libva/libva_1.7.3.bb +++ b/meta/recipes-graphics/libva/libva_1.7.3.bb | |||
@@ -32,8 +32,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
32 | 32 | ||
33 | EXTRA_OECONF = "--disable-dummy-driver" | 33 | EXTRA_OECONF = "--disable-dummy-driver" |
34 | 34 | ||
35 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ | 35 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" |
36 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" | ||
37 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" | 36 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" |
38 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" | 37 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" |
39 | 38 | ||
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb index fab0bdb2ee..e80d1e8acb 100644 --- a/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb +++ b/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb | |||
@@ -30,7 +30,7 @@ PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ | |||
30 | x11 glew glu glx" | 30 | x11 glew glu glx" |
31 | 31 | ||
32 | # The Wayland code doesn't work with Wayland 1.0, so disable it for now | 32 | # The Wayland code doesn't work with Wayland 1.0, so disable it for now |
33 | #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" | 33 | #${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" |
34 | 34 | ||
35 | EXTRA_OECONF = "--with-system-data-files" | 35 | EXTRA_OECONF = "--with-system-data-files" |
36 | 36 | ||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb index f06a3e9b58..85cc396fe3 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_13.0.4.bb | |||
@@ -8,6 +8,6 @@ PROVIDES = "virtual/libgl virtual/mesa" | |||
8 | 8 | ||
9 | S = "${WORKDIR}/mesa-${PV}" | 9 | S = "${WORKDIR}/mesa-${PV}" |
10 | 10 | ||
11 | PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 11 | PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
12 | 12 | ||
13 | EXCLUDE_FROM_WORLD = "1" | 13 | EXCLUDE_FROM_WORLD = "1" |
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 5d882b1001..87c6821e65 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -25,8 +25,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
25 | EXTRA_OECONF = "--enable-shared-glapi" | 25 | EXTRA_OECONF = "--enable-shared-glapi" |
26 | 26 | ||
27 | PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ | 27 | PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ |
28 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ | 28 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ |
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ | ||
30 | " | 29 | " |
31 | 30 | ||
32 | PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" | 31 | PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" |
diff --git a/meta/recipes-graphics/pango/pango_1.40.3.bb b/meta/recipes-graphics/pango/pango_1.40.3.bb index 338ef4a910..e259a820c2 100644 --- a/meta/recipes-graphics/pango/pango_1.40.3.bb +++ b/meta/recipes-graphics/pango/pango_1.40.3.bb | |||
@@ -22,7 +22,7 @@ SRC_URI[archive.sha256sum] = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded9 | |||
22 | 22 | ||
23 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" | 23 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" |
24 | 24 | ||
25 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
26 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" | 26 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" |
27 | 27 | ||
28 | EXTRA_AUTORECONF = "" | 28 | EXTRA_AUTORECONF = "" |
diff --git a/meta/recipes-graphics/wayland/weston_1.11.1.bb b/meta/recipes-graphics/wayland/weston_1.11.1.bb index cdfac70ed1..22b30ad2d3 100644 --- a/meta/recipes-graphics/wayland/weston_1.11.1.bb +++ b/meta/recipes-graphics/wayland/weston_1.11.1.bb | |||
@@ -37,10 +37,8 @@ EXTRA_OECONF_append_qemux86-64 = "\ | |||
37 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ | 37 | WESTON_NATIVE_BACKEND=fbdev-backend.so \ |
38 | " | 38 | " |
39 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ | 39 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ |
40 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ | ||
41 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ | 40 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ |
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | 41 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ |
43 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
44 | clients launch" | 42 | clients launch" |
45 | # | 43 | # |
46 | # Compositor choices | 44 | # Compositor choices |
@@ -85,7 +83,7 @@ do_install_append() { | |||
85 | rm -f ${D}/${libdir}/weston/*.la | 83 | rm -f ${D}/${libdir}/weston/*.la |
86 | 84 | ||
87 | # If X11, ship a desktop file to launch it | 85 | # If X11, ship a desktop file to launch it |
88 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then | 86 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then |
89 | install -d ${D}${datadir}/applications | 87 | install -d ${D}${datadir}/applications |
90 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | 88 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications |
91 | 89 | ||
diff --git a/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb b/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb index 26e02a9e57..0e90ffd67b 100644 --- a/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb +++ b/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb | |||
@@ -11,5 +11,5 @@ PE = "1" | |||
11 | SRC_URI[md5sum] = "f3f76cb10f69b571c43893ea6a634aa4" | 11 | SRC_URI[md5sum] = "f3f76cb10f69b571c43893ea6a634aa4" |
12 | SRC_URI[sha256sum] = "5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d" | 12 | SRC_URI[sha256sum] = "5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d" |
13 | 13 | ||
14 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 14 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
15 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 15 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb index f23d258e0b..77490f5488 100644 --- a/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +++ b/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb | |||
@@ -16,5 +16,5 @@ PE = "1" | |||
16 | SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" | 16 | SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" |
17 | SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" | 17 | SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" |
18 | 18 | ||
19 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
20 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 20 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb index b361ad6ddd..f069749ce0 100644 --- a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb | |||
@@ -23,6 +23,6 @@ BBCLASSEXTEND = "native" | |||
23 | SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" | 23 | SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" |
24 | SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" | 24 | SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" |
25 | 25 | ||
26 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 26 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
27 | PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" | 27 | PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" |
28 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 28 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index da4ed92510..48922cb992 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb | |||
@@ -27,5 +27,5 @@ BBCLASSEXTEND = "native" | |||
27 | SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" | 27 | SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" |
28 | SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" | 28 | SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" |
29 | 29 | ||
30 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 30 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
31 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 31 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb index 402ab0d724..4bfb290ae1 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb | |||
@@ -18,5 +18,5 @@ BBCLASSEXTEND = "native" | |||
18 | SRC_URI[md5sum] = "0d9f6dd9c23bf4bcbfb00504b566baf5" | 18 | SRC_URI[md5sum] = "0d9f6dd9c23bf4bcbfb00504b566baf5" |
19 | SRC_URI[sha256sum] = "e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e" | 19 | SRC_URI[sha256sum] = "e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e" |
20 | 20 | ||
21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
22 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 22 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb index a5694a338e..b11dda57e0 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb | |||
@@ -21,5 +21,5 @@ BBCLASSEXTEND = "native" | |||
21 | SRC_URI[md5sum] = "254ee42bd178d18ebc7a73aacfde7f79" | 21 | SRC_URI[md5sum] = "254ee42bd178d18ebc7a73aacfde7f79" |
22 | SRC_URI[sha256sum] = "02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71" | 22 | SRC_URI[sha256sum] = "02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71" |
23 | 23 | ||
24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 24 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
25 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 25 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb index 07be028f1f..81df1dd8db 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb | |||
@@ -18,5 +18,5 @@ inherit autotools pkgconfig | |||
18 | 18 | ||
19 | EXTRA_OECONF = "--disable-docs" | 19 | EXTRA_OECONF = "--disable-docs" |
20 | 20 | ||
21 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 21 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
22 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," | 22 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," |
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb index d5935ff349..4740c15732 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb | |||
@@ -31,5 +31,5 @@ BBCLASSEXTEND = "native" | |||
31 | SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" | 31 | SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" |
32 | SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" | 32 | SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" |
33 | 33 | ||
34 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 34 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
35 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 35 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 7717802006..1650c7994c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -123,8 +123,8 @@ EXTRA_OECONF += "--with-fop=no \ | |||
123 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" | 123 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" |
124 | PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ | 124 | PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ |
125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
126 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ | 126 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xwayland', '', d)} \ |
127 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ | 127 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
128 | " | 128 | " |
129 | 129 | ||
130 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | 130 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" |