From e0db986b1f77093ab63b5dc1bf44acff9ad89a8a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 12 Oct 2016 11:59:34 -0500 Subject: [PATCH] mesa-demos: Fix configuration for Wayland on i.MX If distro features contains wayland, we assume a wayland backend and configure the package accordingly. Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- recipes-graphics/mesa/mesa-demos_%.bbappend | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index ac5bf65f..722d53dd 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -6,11 +6,10 @@ SRC_URI_append_mx6 = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i. file://Add-OpenVG-demos-to-support-wayland.patch" PACKAGECONFIG_remove_mx6 = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ - bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu', '', d), d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \ +" PACKAGECONFIG_remove_mx6sl = "gles1 gles2" PACKAGECONFIG_append_mx6 = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ - bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \ " -- 2.40.1