1 files changed, 11 insertions, 13 deletions

diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend
index 4b5181851..10db1f9e7 100644
--- a/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1,26 +1,24 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
-                    file://fix-clear-build-break.patch \
-                    file://Add-OpenVG-demos-to-support-wayland.patch"
+SRC_URI:append:imxgpu = " \
+    file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \
+    file://fix-clear-build-break.patch \
+    file://Add-OpenVG-demos-to-support-wayland.patch"
 
+PACKAGECONFIG:remove = " \
+    ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \
+    ${PACKAGECONFIG_REMOVE_IF_GPU}"
 PACKAGECONFIG_REMOVE_IF_2D_ONLY          = ""
 PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu2d = "gles1 gles2"
 PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu3d = ""
 PACKAGECONFIG_REMOVE_IF_GPU              = ""
 PACKAGECONFIG_REMOVE_IF_GPU:imxgpu       = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \
-"
-PACKAGECONFIG:remove = " \
-    ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \
-    ${PACKAGECONFIG_REMOVE_IF_GPU} \
-"
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)}"
 
+PACKAGECONFIG:append = " \
+    ${PACKAGECONFIG_APPEND_IF_GPU}"
 PACKAGECONFIG_APPEND_IF_GPU        = ""
 PACKAGECONFIG_APPEND_IF_GPU:imxgpu = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES',     'x11',       'glut', '', d)} \
-"
-PACKAGECONFIG:append = " \
-    ${PACKAGECONFIG_APPEND_IF_GPU} \
+    ${@bb.utils.contains('DISTRO_FEATURES',     'x11',       'glut', '', d)}"
 "