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 2f108a274..fe88c0ad2 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 From 80d0c87877bc83f265dcae14d46fb6519686ec91 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Sep 2022 10:19:27 -0700 Subject: gtk+3: Fix logical error in removing x11 Last commit had a thinko, where it should be removing x11 only if x11 is not in distro features, but it ended up doing that for wayland Signed-off-by: Khem Raj (cherry picked from commit 7447f7c8784883589195a83e27f8cb0ad430e88e) --- recipes-graphics/gtk+/gtk+3_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend index fe88c0ad2..c4fdfff97 100644 --- a/recipes-graphics/gtk+/gtk+3_%.bbappend +++ b/recipes-graphics/gtk+/gtk+3_%.bbappend @@ -1,6 +1,6 @@ DEPENDS:append:imxgpu2d = " virtual/egl" -WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'wayland', d)}" +WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'x11', d)}" WAYLANDONLY = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${WAYLAND}', '', d)}" PACKAGECONFIG:remove:imxgpu2d = " ${WAYLANDONLY}" -- cgit v1.2.3-54-g00ecf From e632a0a2a3f597d5f05d5112c0dd8b438726dba4 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 15 Sep 2022 10:41:15 -0500 Subject: gtk+3: Drop x11 config logic The original intent of dropping x11 support from the package was so only wayland would be supported. The fix in efcb2fe and 7447f7c removes that. However, it keeps the idea that the x11 packageconfig should be disallowed from being added if x11 is not in the distro features. This was never the intent of the original logic, and since the default is to enable x11 packageconfig if and only if x11 is a distro feature, just drop the logic entirely. Signed-off-by: Tom Hochstein (cherry picked from commit e3f41f8c93ab66b1f124059cf5ce3d24b148285b) --- recipes-graphics/gtk+/gtk+3_%.bbappend | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend index c4fdfff97..6bc01807e 100644 --- a/recipes-graphics/gtk+/gtk+3_%.bbappend +++ b/recipes-graphics/gtk+/gtk+3_%.bbappend @@ -1,6 +1 @@ DEPENDS:append:imxgpu2d = " virtual/egl" - -WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'x11', d)}" -WAYLANDONLY = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${WAYLAND}', '', d)}" - -PACKAGECONFIG:remove:imxgpu2d = " ${WAYLANDONLY}" -- cgit v1.2.3-54-g00ecf