From ac2d289ab6ba92ca10b6926b285656820b6b826c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 29 Oct 2015 09:22:55 -0200 Subject: 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 Acked-by: Daiane Angolini Signed-off-by: Otavio Salvador --- recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 29 ++++++---------------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'recipes-graphics/imx-gpu-viv') diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index 78e1e32ad..2c62711d1 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 \ libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ libvivante-dri-mx6 \ - libvivante-dfb-mx6 \ libvsc-mx6 \ libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ @@ -64,7 +63,6 @@ python __anonymous () { } USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" -USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}" USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" # Inhibit warnings about files being stripped. @@ -122,7 +120,7 @@ do_install () { install -d ${D}${libdir}/pkgconfig - # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb + # 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} @@ -154,26 +152,15 @@ do_install () { 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 else + # Regular framebuffer install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc - if [ "${USE_DFB}" = "yes" ]; then - install -d ${D}/${sysconfdir} - install -m 644 ${S}/gpu-core/etc/directfbrc ${D}/${sysconfdir}/directfbrc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_directfb.pc ${D}${libdir}/pkgconfig/egl.pc - - cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir} - cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} - cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} - backend=dfb - else - # Regular framebuffer - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc - cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} - cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} - backend=fb - fi + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc + cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} + cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} + backend=fb fi # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) @@ -304,8 +291,6 @@ FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}" FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so" RDEPENDS_libvivante-dri-mx6 = "libdrm" -FILES_libvivante-dfb-mx6 = "${libdir}/directfb-*/gfxdrivers/libdirectfb_gal.so" - INSANE_SKIP_libwayland-viv-mx6 += "dev-so" FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" 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 FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc" -FILES_libvivante-dfb-mx6 += "${sysconfdir}/directfbrc" - INSANE_SKIP_imx-gpu-viv-g2d += "dev-so" FILES_imx-gpu-viv-g2d = "${libdir}/libg2d* " FILES_imx-gpu-viv-g2d-dev = "${includedir}/g2d.h" -- cgit v1.2.3-54-g00ecf