[meta-freescale] [meta-fsl-arm][PATCH v3 1/7] imx-gpu-viv: Add a new DISTRO check to support XWayland
Tom Hochstein
tom.hochstein at freescale.com
Wed Nov 25 14:07:22 PST 2015
From: Neena Busireddy <neena.busireddy at freescale.com>
When X11 and Wayland DISTRO_FEATURES are available, install wayland
related libraries as we will be using X11 on top of Wayland(XWayland).
Signed-off-by: Neena Busireddy <neena.busireddy at freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein at freescale.com>
---
recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 35 +++++++++++++---------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 2c62711..bb366c6 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -120,25 +120,11 @@ do_install () {
install -d ${D}${libdir}/pkgconfig
- # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb
- if [ "${USE_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
- #FIXME: WL & X11 is not currently functional
- #if [ "${USE_WL}" = "yes" ]; then
- # 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
- #fi
- elif [ "${USE_WL}" = "yes" ]; then
+ # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb
+ if [ "${USE_WL}" = "yes" ]; then
+ if [ "${USE_X11}" = "yes" ]; then
+ cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
+ fi
cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
@@ -151,6 +137,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 [ "${USE_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.1.4
More information about the meta-freescale
mailing list