From de38b70a6d0ce718404c267f465a0c7804cc60c9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 29 Apr 2016 14:16:47 -0300 Subject: [PATCH] imx-gpu-viv: Prefer using Wayland over X11 backend The Wayland backend ought to be used over the X11, if both DISTRO_FEATURES are enabled. Change-Id: I64d793a9a46d4d9a8a02caf210a259123a8bc56e Signed-off-by: Otavio Salvador --- recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index 4ad7a029..aa849506 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc @@ -111,19 +111,9 @@ do_install () { install -d ${D}${libdir}/pkgconfig - # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb - if [ "${HAS_X11}" = "yes" ]; then - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} - cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir} - - backend=x11 - - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc - elif [ "${HAS_WL}" = "yes" ]; then + # The preference order, based in DISTRO_FEATURES. The backend + # preference order is Wayland, X11 and Framebuffer. + if [ "${HAS_WL}" = "yes" ]; then cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} @@ -136,6 +126,17 @@ do_install () { install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc + elif [ "${HAS_X11}" = "yes" ]; then + cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} + cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} + cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir} + + backend=x11 + + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc else # Regular framebuffer install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc -- 2.40.1