From d09f5126a0090c8216fb0315942205157b8f7cc5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 31 Aug 2013 17:58:55 -0300 Subject: [PATCH] gpu-viv-bin-mx6q.inc: If Wayland and X11 are enabled, default to X11 Vivante GPU driver does not support use of Wayland AND X11 backends at same time, so we need to choose one for default. We previously had choose Wayland but many users are reporting problems as the usual expected support is still X11 so we're moving the default for X11 now. Change-Id: I30f092509f060d3bced358324a296b0f798da2cb Signed-off-by: Otavio Salvador --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 0a539008..8a3efaf5 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 @@ -106,8 +106,15 @@ do_install () { install -d ${D}${libdir}/pkgconfig - # If both X11 and Wayland are set in DISTRO_FEATURES then use Wayland as base window system - if [ "${USE_WL}" = "yes" ]; then + # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb + if [ "${USE_X11}" = "yes" ]; then + cp -r ${S}/usr/lib/dri ${D}${libdir} + backend=x11 + + 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 + elif [ "${USE_WL}" = "yes" ]; then backend=wl install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc @@ -121,13 +128,6 @@ do_install () { 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 - - 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 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