summaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-04-29 14:16:47 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-06-02 15:22:35 -0300
commitde38b70a6d0ce718404c267f465a0c7804cc60c9 (patch)
treec30c7da9192478ba9039a163f83167a4f1976f5f /recipes-graphics
parentd27ebc5819efc6b3a2379d14b8eda02c634c7e36 (diff)
downloadmeta-freescale-de38b70a6d0ce718404c267f465a0c7804cc60c9.tar.gz
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 <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc27
1 files 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 () {
111 111
112 install -d ${D}${libdir}/pkgconfig 112 install -d ${D}${libdir}/pkgconfig
113 113
114 # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb 114 # The preference order, based in DISTRO_FEATURES. The backend
115 if [ "${HAS_X11}" = "yes" ]; then 115 # preference order is Wayland, X11 and Framebuffer.
116 cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} 116 if [ "${HAS_WL}" = "yes" ]; then
117 cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir}
118 cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir}
119
120 backend=x11
121
122 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
123 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
124 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
125 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
126 elif [ "${HAS_WL}" = "yes" ]; then
127 cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} 117 cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
128 cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} 118 cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
129 119
@@ -136,6 +126,17 @@ do_install () {
136 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc 126 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
137 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc 127 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
138 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc 128 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
129 elif [ "${HAS_X11}" = "yes" ]; then
130 cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
131 cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir}
132 cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir}
133
134 backend=x11
135
136 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
137 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
138 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
139 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
139 else 140 else
140 # Regular framebuffer 141 # Regular framebuffer
141 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc 142 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc