From f9ed8b9fa1b348baed17b97110c2a2403b058dbc Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sun, 31 Mar 2024 17:58:49 +0200 Subject: gtk+3: disable wayland without opengl 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. (From OE-Core rev: 35a7e970bfba02fa01ebcf03169d2ddad90ad419) Signed-off-by: Markus Volk Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 4a04c06432..e1603b43fc 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -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)}" -- cgit v1.2.3-54-g00ecf