From 7d81722e12930303d6455849c3c76a314a2df736 Mon Sep 17 00:00:00 2001 From: Neena Busireddy Date: Wed, 27 Aug 2014 13:41:46 -0500 Subject: [PATCH] gpu-viv-bin-mx6q: Upgrade to 3.10.31-1.1.0 beta - Support for mx6sx (GC400T) added - Support for Khronos OpenGL ES 3.0 API for i.MX6Quad, i.MX6Dual, i.MX6Solo - Rendering pipeline enhancements - High quality ETC2/EAC texture compression support - Shading language enhancements - Enhanced texturing functionality The license checksum has change due the copyright's year adjustments; there are no changes in the license terms. Signed-off-by: Neena Busireddy Signed-off-by: Otavio Salvador --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 30 +++++++++++++------ .../gpu-viv-bin-mx6q/glesv1_cm.pc | 2 +- .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc | 2 +- .../gpu-viv-bin-mx6q/glesv2.pc | 2 +- .../gpu-viv-bin-mx6q_3.10.17-1.0.2-sfp.bb | 9 ------ ... => gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb} | 4 +-- .../gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb | 12 ++++++++ 7 files changed, 38 insertions(+), 23 deletions(-) delete mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-sfp.bb rename meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/{gpu-viv-bin-mx6q_3.10.17-1.0.2-hfp.bb => gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb} (55%) create mode 100644 meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index 01202070..b69bcc57 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -5,7 +5,7 @@ DESCRIPTION = "GPU driver and apps for imx6" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3" +LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c4713c78d7f52bf2f92688a6f8f0cc93" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', \ base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -14,12 +14,13 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamag PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg" PROVIDES_append_mx6q = " virtual/libgl virtual/libgles1 virtual/libgles2" PROVIDES_append_mx6dl = " virtual/libgl virtual/libgles1 virtual/libgles2" +PROVIDES_append_mx6sx = " virtual/libgl virtual/libgles1 virtual/libgles2" PE = "1" inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ +# FIXME: Drop 'beta' suffix for GA release +SRC_URI = "${FSL_MIRROR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}.bin;fsl-eula=true \ file://egl.pc \ file://egl_x11.pc \ file://glesv1_cm.pc \ @@ -33,6 +34,7 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ file://wayland-viv.pc \ file://directfbrc \ " +S = "${WORKDIR}/${PN}-${@'${PV}'.replace('1.1.0', '1.1.0-beta')}" PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ @@ -128,6 +130,7 @@ do_install () { install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc + mv ${D}${libdir}/libGAL_egl.dri.so ${D}${libdir}/libGAL_egl.so #FIXME: WL & X11 is not currently functional #if [ "${USE_WL}" = "yes" ]; then # install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc @@ -144,6 +147,7 @@ do_install () { install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc + mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so else install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc @@ -154,12 +158,13 @@ do_install () { install -d ${D}/${sysconfdir} install -m 644 ${WORKDIR}/directfbrc ${D}/${sysconfdir}/directfbrc - cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir} + cp -r ${S}/usr/lib/directfb-* ${D}${libdir} backend=dfb else # Regular framebuffer backend=fb fi + mv ${D}${libdir}/libGAL_egl.${backend}.so ${D}${libdir}/libGAL_egl.so fi # We'll only have one backend here so we rename it to generic name @@ -186,8 +191,9 @@ do_install () { rm ${D}${libdir}/libwayland-viv.* fi - for backend in wl x11 fb dfb; do + for backend in wl x11 fb dfb dri; do find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';' + find ${D}${libdir} -name "*.$backend.so" -exec rm '{}' ';' done # FIXME: MX6SL does not have 3D support; hack it for now @@ -200,12 +206,14 @@ do_install () { \ ${D}${libdir}/libOpenCL* \ \ - ${D}${libdir}/libOpenVG.so ${D}${libdir}/libOpenVG_3D.so \ + ${D}${libdir}/libOpenVG.so ${D}${libdir}/libOpenVG.3d.so \ + \ + ${D}${libdir}/libVivanteOpenCL.so \ \ ${D}/opt/viv_samples/vdk \ ${D}/opt/viv_samples/es20 ${D}/opt/viv_samples/cl11 - ln -sf libOpenVG_355.so ${D}${libdir}/libOpenVG.so + ln -sf libOpenVG.2d.so ${D}${libdir}/libOpenVG.so fi find ${D}${libdir} -type f -exec chmod 644 {} \; @@ -215,6 +223,7 @@ do_install () { FILES_${PN} += "/opt" FILES_${PN}-dev = "${includedir}" FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug" +INSANE_SKIP_${PN} += "rpaths" FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}" FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" @@ -225,6 +234,9 @@ INSANE_SKIP_libegl-mx6 += "dev-so" FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}" +RDEPENDS_libgl-mx6 = "libglapi" +# Includes GL headers from mesa +RDEPENDS_libgl-mx6-dev += "libgl-mesa-dev" FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}" FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}" @@ -236,7 +248,7 @@ FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}" # libEGL needs to open libGLESv1.so INSANE_SKIP_libgles-mx6 += "dev-so" -FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}" +FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS}" FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}" @@ -272,7 +284,7 @@ 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-1.6-0/gfxdrivers/libdirectfb_gal.so" +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}" diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc index d97b067f..994b5d9f 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc @@ -7,6 +7,6 @@ Name: glesv1_cm Description: Vivante OpenGL ES 1.1 CM library Requires.private: Version: 8.0 -Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL -lGAL_egl Libs.private: -lm -lpthread -ldl Cflags: -I${includedir} diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc index e801633b..c59c0796 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc @@ -7,6 +7,6 @@ Name: glesv1_cm Description: Vivante OpenGL ES 1.1 CM library Requires.private: libdrm x11 xext xdamage xfixes xcb Version: 8.0 -Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL -lGAL_egl Libs.private: -lm -lpthread -ldl Cflags: -I${includedir} diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc index 9be46f27..8c9fdd75 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc @@ -7,6 +7,6 @@ Name: glesv2 Description: Vivante OpenGL ES 2.0 library Requires.private: Version: 8.0 -Libs: -L${libdir} -lGLESv2 -lEGL -lGAL +Libs: -L${libdir} -lGLESv2 -lEGL -lGAL -lGAL_egl Libs.private: -lpthread -lrt Cflags: -I${includedir} diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-sfp.bb b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-sfp.bb deleted file mode 100644 index df9bdec8..00000000 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-sfp.bb +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2013, 2014 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) - -require gpu-viv-bin-mx6q.inc - -SRC_URI[md5sum] = "8eb1c16e514a8727614d6167799a4495" -SRC_URI[sha256sum] = "df70d763e433dffaa51da0f4a9f38b40d5b42ef89e8efeab928414dd746c0b89" - -PACKAGE_FP_TYPE = "softfp" diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-hfp.bb b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb similarity index 55% rename from meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-hfp.bb rename to meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb index 6a5995d9..8e509342 100644 --- a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.2-hfp.bb +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-hfp.bb @@ -3,7 +3,7 @@ require gpu-viv-bin-mx6q.inc -SRC_URI[md5sum] = "d3080f644f65446e682d79c36ad1616d" -SRC_URI[sha256sum] = "d480546638b39d37b7e571d131b480a2f2f0380299ea6b2b691a02b2173ea273" +SRC_URI[md5sum] = "8aa5c16021ce38762e7e3c07a57146eb" +SRC_URI[sha256sum] = "c132de60b28c73e8d6ea12219151ca9a0a0bb4f73d62ca1bdd0feac6db0d964e" PACKAGE_FP_TYPE = "hardfp" diff --git a/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb new file mode 100644 index 00000000..fed2f8e0 --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.31-1.1.0-sfp.bb @@ -0,0 +1,12 @@ +# Copyright (C) 2013, 2014 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +require gpu-viv-bin-mx6q.inc + +SRC_URI[md5sum] = "8e8719c2e135c2524817a62002eec0e1" +SRC_URI[sha256sum] = "fd85593186f6b66a26e538edf6279034741a96d2f4ceb6108deb2fa5c35c962d" + +# FIXME skip the QA error for viv-samples +INSANE_SKIP_${PN} += "rpaths" + +PACKAGE_FP_TYPE = "softfp" -- 2.40.1