From 1a2fb37a4cb169ceed379c0a2d4e481fca11adf3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 14 Jul 2025 11:18:06 +0200 Subject: wxwidgets: enable webkit only with x11 or wayland * otherwise webkit enabled by default in 7c3dccab64f2c1733169d6fcba56eeb139a05b45 will conflict with no_gui PACKAGECONFIG which is enabled in DISTROs without x11 and wayland * fixes: ERROR: meta-oe/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb: wxwidgets: PACKAGECONFIG[webkit] Conflict package config 'no_gui' set in PACKAGECONFIG. Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb index ce45d366c0..4a531f30ae 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.8.bb @@ -46,7 +46,7 @@ EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ " -PACKAGECONFIG:append:class-target = " mediactrl webkit" +PACKAGECONFIG:append:class-target = " mediactrl ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'webkit', '', d)}" PACKAGECONFIG:remove:class-native = "opengl" -- cgit v1.2.3-54-g00ecf