diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-29 09:22:55 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:21 -0300 |
commit | ac2d289ab6ba92ca10b6926b285656820b6b826c (patch) | |
tree | 3b503766337552948f263e3e248093bd7e85e32d /recipes-graphics/imx-gpu-viv | |
parent | b3595d343332a8a564bb29cfa694be45fed24083 (diff) | |
download | meta-freescale-ac2d289ab6ba92ca10b6926b285656820b6b826c.tar.gz |
Remove DirectFB support for i.MX6
The DirectFB project is dead upstream for a while and the backend is
deprecated so it is better to drop it and avoid new users to depend on
it and instead to focus in the current technologies for new projects.
This commit removes everything related to the DirectFB support so if
someone wish to revert it locally it can be easily done.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-graphics/imx-gpu-viv')
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index 78e1e32a..2c62711d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | |||
@@ -36,7 +36,6 @@ PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ | |||
36 | libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ | 36 | libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ |
37 | libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ | 37 | libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ |
38 | libvivante-dri-mx6 \ | 38 | libvivante-dri-mx6 \ |
39 | libvivante-dfb-mx6 \ | ||
40 | libvsc-mx6 \ | 39 | libvsc-mx6 \ |
41 | libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ | 40 | libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ |
42 | libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ | 41 | libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ |
@@ -64,7 +63,6 @@ python __anonymous () { | |||
64 | } | 63 | } |
65 | 64 | ||
66 | USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" | 65 | USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" |
67 | USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}" | ||
68 | USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" | 66 | USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" |
69 | 67 | ||
70 | # Inhibit warnings about files being stripped. | 68 | # Inhibit warnings about files being stripped. |
@@ -122,7 +120,7 @@ do_install () { | |||
122 | 120 | ||
123 | install -d ${D}${libdir}/pkgconfig | 121 | install -d ${D}${libdir}/pkgconfig |
124 | 122 | ||
125 | # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb | 123 | # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb |
126 | if [ "${USE_X11}" = "yes" ]; then | 124 | if [ "${USE_X11}" = "yes" ]; then |
127 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} | 125 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} |
128 | cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} | 126 | cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} |
@@ -154,26 +152,15 @@ do_install () { | |||
154 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc | 152 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc |
155 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc | 153 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc |
156 | else | 154 | else |
155 | # Regular framebuffer | ||
157 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 156 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |
158 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc | 157 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc |
159 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc | 158 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc |
160 | 159 | ||
161 | if [ "${USE_DFB}" = "yes" ]; then | 160 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc |
162 | install -d ${D}/${sysconfdir} | 161 | cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} |
163 | install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc | 162 | cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} |
164 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc | 163 | backend=fb |
165 | |||
166 | cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir} | ||
167 | cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} | ||
168 | cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} | ||
169 | backend=dfb | ||
170 | else | ||
171 | # Regular framebuffer | ||
172 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc | ||
173 | cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} | ||
174 | cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} | ||
175 | backend=fb | ||
176 | fi | ||
177 | fi | 164 | fi |
178 | 165 | ||
179 | # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) | 166 | # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) |
@@ -304,8 +291,6 @@ FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}" | |||
304 | FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so" | 291 | FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so" |
305 | RDEPENDS_libvivante-dri-mx6 = "libdrm" | 292 | RDEPENDS_libvivante-dri-mx6 = "libdrm" |
306 | 293 | ||
307 | FILES_libvivante-dfb-mx6 = "${libdir}/directfb-*/gfxdrivers/libdirectfb_gal.so" | ||
308 | |||
309 | INSANE_SKIP_libwayland-viv-mx6 += "dev-so" | 294 | INSANE_SKIP_libwayland-viv-mx6 += "dev-so" |
310 | FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" | 295 | FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" |
311 | FILES_libwayland-viv-mx6-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" | 296 | FILES_libwayland-viv-mx6-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" |
@@ -318,8 +303,6 @@ FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS | |||
318 | 303 | ||
319 | FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc" | 304 | FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc" |
320 | 305 | ||
321 | FILES_libvivante-dfb-mx6 += "${sysconfdir}/directfbrc" | ||
322 | |||
323 | INSANE_SKIP_imx-gpu-viv-g2d += "dev-so" | 306 | INSANE_SKIP_imx-gpu-viv-g2d += "dev-so" |
324 | FILES_imx-gpu-viv-g2d = "${libdir}/libg2d* " | 307 | FILES_imx-gpu-viv-g2d = "${libdir}/libg2d* " |
325 | FILES_imx-gpu-viv-g2d-dev = "${includedir}/g2d.h" | 308 | FILES_imx-gpu-viv-g2d-dev = "${includedir}/g2d.h" |