diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-05-21 19:00:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-27 11:04:47 +0100 |
commit | 2e29151a3a660871db3009fc64a5e1e72f1827b0 (patch) | |
tree | 47b607f1599116ae7e82e0df70c56cfece422fcc /meta/recipes-gnome | |
parent | e620119715673af7dc7c24a0c643bcab6dce71d0 (diff) | |
download | poky-2e29151a3a660871db3009fc64a5e1e72f1827b0.tar.gz |
bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target
This will allow better control over native virgl/qemu configurations.
Adjust gtk+3/cairo native configurations to actually ignore opengl
when building for -native: we do not need it, and it would cause build
failures as only a limited subset of mesa-native is currently built.
Drop native/nativesdk overrides from virglrenderer/libepoxy recipes
as opengl feature is now correctly set for those variants.
(From OE-Core rev: 0e1f8fa0535dab63742f575b52ec9fa891368ca2)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 5d1f59ea1a..6154154004 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -46,6 +46,8 @@ do_compile_prepend() { | |||
46 | 46 | ||
47 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ | 47 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ |
48 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" | 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" |
49 | PACKAGECONFIG_class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
50 | PACKAGECONFIG_class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
49 | 51 | ||
50 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" | 52 | PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" |
51 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build | 53 | # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build |