[meta-freescale] [PATCH] Restrict virtual/libgl and libvivante-dri

[Jens Rehsack]

to appropriate DISTRO_FEATURES to avoid broken builds because of requirements of libdrm or mesa.

Signed-off-by: Jens Rehsack <sno at netbsd.org>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 468849c..c2afd09 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -12,10 +12,15 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamag
                                            '', d), d)}"
 
 EXTRA_PROVIDES = ""
-EXTRA_PROVIDES_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-EXTRA_PROVIDES_mx6dl  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-EXTRA_PROVIDES_mx6sx  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"
+EXTRA_PROVIDES_mx6q  = " virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6q  += " ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libgl', '', d)}"
+EXTRA_PROVIDES_mx6dl  = " virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6dl  += " ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libgl', '', d)}"
+EXTRA_PROVIDES_mx6sx  = " virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6sx  += " ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libgl', '', d)}"
+PROVIDES += " ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libgal-x11 ', '', d)}"
+PROVIDES += " ${@base_contains('DISTRO_FEATURES', 'wayland', 'virtual/wayland-egl ', '', d)}"
+PROVIDES += " virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"
 
 PE = "1"
 
@@ -266,9 +271,9 @@ FILES_libvsc-mx6 = "${libdir}/libVSC${SOLIBS}"
 FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
 FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}"
 FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
-RDEPENDS_libgl-mx6 = "libglapi"
+RDEPENDS_libgl-mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', 'libglapi', '', d)}"
 # Includes GL headers from mesa
-RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev"
+RDEPENDS_libgl-mx6-dev += "${@base_contains('DISTRO_FEATURES', 'x11', 'libgl-mesa-dev', '', d)}"
 
 # libEGL needs to open libGLESv1.so
 INSANE_SKIP_libgles-mx6 += "dev-so"
@@ -313,7 +318,7 @@ FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}"
 FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
 
 FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so"
-RDEPENDS_libvivante-dri-mx6 = "libdrm"
+RDEPENDS_libvivante-dri-mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', 'libdrm', '', d)}"
 
 FILES_libvivante-dfb-mx6 = "${libdir}/directfb-*/gfxdrivers/libdirectfb_gal.so"
 
-- 
1.9.1

-- 
Jens Rehsack - rehsack at gmail.com