diff options
author | Andy Voltz <andy.voltz@timesys.com> | 2013-10-24 15:18:00 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-10-28 10:13:34 -0200 |
commit | fff173eba77e41f9a01b7f2f8d7c7591105fa9f0 (patch) | |
tree | e1469e36996fb8910d41c52ac349fead50b3bf02 /recipes-graphics/gpu-viv-bin-mx6q | |
parent | e8c6cf822889c02b76db03f2e9c6915a1bda1c06 (diff) | |
download | meta-fsl-arm-fff173eba77e41f9a01b7f2f8d7c7591105fa9f0.tar.gz |
gpu-viv-bin-mx6q: Cleanup wayland install, disable wayland & X11 for now
Signed-off-by: Andy Voltz <andy.voltz@timesys.com>
Diffstat (limited to 'recipes-graphics/gpu-viv-bin-mx6q')
-rw-r--r-- | recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index 431859a..f0d4239 100644 --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | |||
@@ -114,6 +114,12 @@ do_install () { | |||
114 | install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc | 114 | install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc |
115 | install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 115 | install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |
116 | install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc | 116 | install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc |
117 | #FIXME: WL & X11 is not currently functional | ||
118 | #if [ "${USE_WL}" = "yes" ]; then | ||
119 | # install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc | ||
120 | # install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc | ||
121 | # install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc | ||
122 | #fi | ||
117 | elif [ "${USE_WL}" = "yes" ]; then | 123 | elif [ "${USE_WL}" = "yes" ]; then |
118 | backend=wl | 124 | backend=wl |
119 | 125 | ||
@@ -123,11 +129,6 @@ do_install () { | |||
123 | install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc | 129 | install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc |
124 | install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc | 130 | install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc |
125 | install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc | 131 | install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc |
126 | |||
127 | # Wayland + X11 support | ||
128 | if [ "${USE_X11}" = "yes" ]; then | ||
129 | cp -r ${S}/usr/lib/dri ${D}${libdir} | ||
130 | fi | ||
131 | else | 132 | else |
132 | install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc | 133 | install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc |
133 | install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 134 | install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |