From f00fb04d01505ed23cd85ad3113d45d7512e8c18 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 13 Sep 2022 20:43:24 -0700 Subject: gtk+: Disable x11 only when wayland is in distro_features but x11 is not Some distros enable both x11 and wayland in distro features in such cases it should not remove x11 from distro features. Signed-off-by: Khem Raj (cherry picked from commit efcb2fe79c96beca4d7709a66aa7872839f14b9f) --- recipes-graphics/gtk+/gtk+3_%.bbappend | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend index 2f108a27..fe88c0ad 100644 --- a/recipes-graphics/gtk+/gtk+3_%.bbappend +++ b/recipes-graphics/gtk+/gtk+3_%.bbappend @@ -1,5 +1,6 @@ DEPENDS:append:imxgpu2d = " virtual/egl" -PACKAGECONFIG:remove:imxgpu2d = " \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "x11", "", d)} \ -" +WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'wayland', d)}" +WAYLANDONLY = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${WAYLAND}', '', d)}" + +PACKAGECONFIG:remove:imxgpu2d = " ${WAYLANDONLY}" -- cgit v1.2.3-54-g00ecf