Patchwork gpu-viv-bin-mx6q: Cleanup wayland install, disable wayland & X11 for now

login
register
mail settings
Submitter Andy Voltz
Date Oct. 24, 2013, 3:18 p.m.
Message ID <1382627880-8213-2-git-send-email-andy.voltz@timesys.com>
Download mbox | patch
Permalink /patch/60477/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Andy Voltz - Oct. 24, 2013, 3:18 p.m.
Signed-off-by: Andy Voltz <andy.voltz@timesys.com>
---
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc          |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Patch

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 431859a..f0d4239 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -114,6 +114,12 @@  do_install () {
         install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
         install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
         install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
+        #FIXME: WL & X11 is not currently functional
+        #if [ "${USE_WL}" = "yes" ]; then
+        #    install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
+        #    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
+        #fi
     elif [ "${USE_WL}" = "yes" ]; then
         backend=wl
 
@@ -123,11 +129,6 @@  do_install () {
         install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
         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
     else
         install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
         install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc