@@ -33,7 +33,10 @@ GTKDOC_MESON_OPTION = 'gtk_doc'
EXTRA_OEMESON = "-Dxinerama=no -Dtests=false"
EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)}"
+PACKAGECONFIG ??= " \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl x11', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland', '', d)} \
+"
PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
Wayland backend requires epoxy so it will pull in a requirement for opengl While doing some tests in building old stuff like matchbox-terminal with vte 0.76, I encountered an issue with building matchbox-terminal without opengl in DISTRO_FEATURES. Explicitly stating that the Wayland backend requires opengl fixes this problem and allows matchbox-terminal to be used without. Signed-off-by: Markus Volk <f_l_k@t-online.de> --- meta/recipes-gnome/gtk+/gtk+3.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)