From 36b1840a853ed1b2d766b06b6644692e7f95d398 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Wed, 27 Jun 2018 17:17:27 -0500
Subject: [PATCH] mesa: Adjust install for files provided by imx-gpu-viv

- Remove wayland-egl.pc
- Remove KHR headers

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/mesa/mesa_%.bbappend | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 742d2e1a..48dfa331 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -34,10 +34,9 @@ do_install_append_imxgpu3d () {
     fi
 }
 
-do_install_append_imxgpu2d () {
-    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
-}
-
-do_install_append_imxgpu2d () {
-    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
+do_install_append_imxgpu () {
+    rm -f ${D}${includedir}/KHR
+    if [ "${BACKEND}" = "wayland" ]; then
+        rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
+    fi
 }
-- 
2.40.1