From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Tue, 7 Mar 2017 01:19:42 +0000 (-0600)
Subject: imx-gpu-viv: Fix build break for missing gl headers
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2461898d70ffbe8459ed1c1b4e95636af0f35a38;p=meta-freescale.git

imx-gpu-viv: Fix build break for missing gl headers

For x11 graphics and Wayland graphics with XWayland support, a build
break is possible due to missing headers. This is because imx-gpu-viv
does not provide everything it needs to for virtual/libgl and depends
on mesa to fill in what is missing. Adding a dependency on mesa
fixes the build break.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index e5aacf32..9c981326 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -9,11 +9,16 @@ LIC_FILES_CHKSUM = "file://gpu-core/usr/include/gc_vdk.h;beginline=5;endline=11;
 
 DEPENDS += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
                                                        '', d), d)} \
     libpng \
 "
 
+# imx-gpu-viv does not provide everything it needs to for virtual/libgl
+# on x11 backend or on Wayland backend with XWayland support.
+# We depend on mesa to fill in what is missing.
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
+
 EXTRA_PROVIDES = ""
 EXTRA_PROVIDES_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2"
 PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"