From 31ac443da411072a0d8961f81cc10adcb5a0ac6a Mon Sep 17 00:00:00 2001 From: Andy Voltz Date: Thu, 24 Oct 2013 15:18:00 +0000 Subject: [PATCH] gpu-viv-bin-mx6q: Cleanup wayland install, disable wayland & X11 for now Signed-off-by: Andy Voltz --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 431859ac..f0d42391 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 @@ -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 -- 2.40.1