From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 13 Mar 2014 15:20:28 +0000 (-0300)
Subject: gpu-viv-bin-mx6q: Depends on 'wayland' when needed
X-Git-Tag: 2.1~992
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b99650a4b838756be4153d484566aa13abfffc2a;p=meta-freescale.git

gpu-viv-bin-mx6q: Depends on 'wayland' when needed

When using Wayland support, a dependency on 'wayland' is needed so the
shlib dependency can be done accordingly and we can have a
deterministic build.

Change-Id: Ief7caced3abf282d83fcd93c8bcb4a5622414c20
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 32867e7f..40fcb2f3 100644
--- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -6,7 +6,14 @@ DESCRIPTION = "GPU driver and apps for imx6"
 SECTION = "libs"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}"
+
+X11_DEPENDS = "virtual/libx11 libxdamage libxext libxfixes mesa"
+WL_DEPENDS = "wayland"
+
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', '${X11_DEPENDS}', \
+                             base_contains('DISTRO_FEATURES', 'wayland', '${WL_DEPENDS}', \
+                                           '', d), d)}"
+
 PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg"
 
 PE = "1"