diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-03-31 17:58:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-04 14:05:03 +0100 |
commit | f9ed8b9fa1b348baed17b97110c2a2403b058dbc (patch) | |
tree | 91f92737ab95b6c7bad52d2a67ef2d26fec3e6c5 /meta/recipes-gnome | |
parent | 8d27d8ff7cc65d2059ca29352b57301ffc35a163 (diff) | |
download | poky-f9ed8b9fa1b348baed17b97110c2a2403b058dbc.tar.gz |
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 <f_l_k@t-online.de>
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 | 5 |
1 files changed, 4 insertions, 1 deletions
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' | |||
33 | EXTRA_OEMESON = "-Dxinerama=no -Dtests=false" | 33 | EXTRA_OEMESON = "-Dxinerama=no -Dtests=false" |
34 | EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false" | 34 | EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false" |
35 | 35 | ||
36 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)}" | 36 | PACKAGECONFIG ??= " \ |
37 | ${@bb.utils.filter('DISTRO_FEATURES', 'opengl x11', d)} \ | ||
38 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland', '', d)} \ | ||
39 | " | ||
37 | PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 40 | PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
38 | PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 41 | PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
39 | 42 | ||