diff mbox series

[kirkstone,11/19] gtk+3: disable wayland without opengl

Message ID 2782719072163474aa3e444578cb48fea3ae60bc.1762157680.git.joerg.sommer@navimatix.de
State New
Headers show
Series [kirkstone,01/19] gtk+3: upgrade 3.24.34 -> 3.24.35 | expand

Commit Message

Jörg Sommer Nov. 3, 2025, 8:22 a.m. UTC 
From: Markus Volk <f_l_k@t-online.de>

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 <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cherry-pick-of: f9ed8b9fa1b348baed17b97110c2a2403b058dbc
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 meta/recipes-gnome/gtk+/gtk+3.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

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)}"