From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 29 Jul 2013 16:05:07 +0000 (-0300)
Subject: gpu-viv-bin-mx6q.inc: Ensure DRI module is add for Wayland + X11 case
X-Git-Tag: 2.1~1281
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bdb9d3fc41af7d32330e74be667dfffb9e5c921a;p=meta-freescale.git

gpu-viv-bin-mx6q.inc: Ensure DRI module is add for Wayland + X11 case

When Wayland and X11 distro features are enabled, ensure DRI module is
installed. Fixes a regression introduced by 20d7652 (gpu-viv-bin-mx6q:
Adding support to install Wayland GPU libs).

Change-Id: I0b515641edee6a172469f65068f9de837b592c87
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 fbc9eff3..f63ed3c7 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
@@ -104,6 +104,10 @@ do_install () {
         install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
         install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
 
+        # Wayland + X11 support
+        if [ "${USE_X11}" = "yes" ]; then
+            cp -r ${S}/usr/lib/dri ${D}${libdir}
+        fi
     elif [ "${USE_X11}" = "yes" ]; then
         cp -r ${S}/usr/lib/dri ${D}${libdir}
         backend=x11