summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2017-03-06 19:19:42 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2017-03-09 17:30:07 -0300
commit2461898d70ffbe8459ed1c1b4e95636af0f35a38 (patch)
treec859ede92264c83eb7c56127f019069b42cbf05b
parent3de58ea315d031cce27f21aa6ac507060328f3f6 (diff)
downloadmeta-freescale-2461898d70ffbe8459ed1c1b4e95636af0f35a38.tar.gz
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>
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc7
1 files changed, 6 insertions, 1 deletions
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;
9 9
10DEPENDS += " \ 10DEPENDS += " \
11 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ 11 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
12 bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \ 12 bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
13 '', d), d)} \ 13 '', d), d)} \
14 libpng \ 14 libpng \
15" 15"
16 16
17# imx-gpu-viv does not provide everything it needs to for virtual/libgl
18# on x11 backend or on Wayland backend with XWayland support.
19# We depend on mesa to fill in what is missing.
20DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
21
17EXTRA_PROVIDES = "" 22EXTRA_PROVIDES = ""
18EXTRA_PROVIDES_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2" 23EXTRA_PROVIDES_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2"
19PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}" 24PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"