summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc13
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index 8536461d..525f0a2a 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -109,8 +109,7 @@ do_install () {
109 109
110 install -d ${D}${libdir}/pkgconfig 110 install -d ${D}${libdir}/pkgconfig
111 111
112 # The preference order, based in DISTRO_FEATURES. The backend 112 # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb
113 # preference order is Wayland, X11 and Framebuffer.
114 if [ "${HAS_WL}" = "yes" ]; then 113 if [ "${HAS_WL}" = "yes" ]; then
115 cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} 114 cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
116 cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} 115 cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
@@ -124,7 +123,13 @@ do_install () {
124 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc 123 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
125 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc 124 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
126 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc 125 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
126
127 if [ "${HAS_X11}" = "yes" ]; then
128 cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
129 fi
130
127 elif [ "${HAS_X11}" = "yes" ]; then 131 elif [ "${HAS_X11}" = "yes" ]; then
132
128 cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} 133 cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
129 cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} 134 cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir}
130 cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir} 135 cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir}
@@ -136,11 +141,11 @@ do_install () {
136 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc 141 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
137 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc 142 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
138 else 143 else
139 # Regular framebuffer
140 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc 144 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
141 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc 145 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
142 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc 146 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
143 147
148 # Regular framebuffer
144 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc 149 install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
145 cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} 150 cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir}
146 cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} 151 cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir}
@@ -185,7 +190,7 @@ do_install () {
185 if [ "${IMXGPU}" = "2d" ]; then 190 if [ "${IMXGPU}" = "2d" ]; then
186 rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ 191 rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \
187 \ 192 \
188 ${D}${libdir}/libGL* ${D}${includedir}/GL* \ 193 ${D}${libdir}/libGL* ${D}${includedir}/GL* \
189 \ 194 \
190 ${D}${libdir}/libGLES* \ 195 ${D}${libdir}/libGLES* \
191 \ 196 \