From c1f57b426317c792ac302a52ef363d4b44619fc4 Mon Sep 17 00:00:00 2001 From: Mihai Lindner Date: Wed, 18 Dec 2019 19:28:06 +0200 Subject: [PATCH] imx-gpu-viv: Upgrade to 6.4.0.p1.0 Signed-off-by: Mihai Lindner --- .../imx-gpu-viv/imx-gpu-viv-6.inc | 26 ++++++++++++++----- .../imx-gpu-viv_6.2.4.p4.0-aarch64.bb | 6 ----- ...2.bb => imx-gpu-viv_6.4.0.p1.0-aarch32.bb} | 5 ++-- .../imx-gpu-viv_6.4.0.p1.0-aarch64.bb | 6 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb rename recipes-graphics/imx-gpu-viv/{imx-gpu-viv_6.2.4.p4.0-aarch32.bb => imx-gpu-viv_6.4.0.p1.0-aarch32.bb} (60%) create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch64.bb diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 43d86ef2..cf7b1fa2 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -6,7 +6,7 @@ DESCRIPTION = "GPU driver and apps for i.MX" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" +LIC_FILES_CHKSUM = "file://COPYING;md5=6c12031a11b81db21cdfe0be88cac4b3" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -33,8 +33,6 @@ EXTRA_PROVIDES_append_imxgpu3d = " \ " EXTRA_PROVIDES_append_mx8 = " \ virtual/libgbm \ -" -EXTRA_PROVIDES_append_mx8qm = " \ virtual/libopenvx \ " PROVIDES += " \ @@ -81,6 +79,7 @@ PACKAGES =+ "libclc-imx libclc-imx-dev \ imx-gpu-viv-demos \ libvulkan-imx libvulkan-imx-dev \ libopenvx-imx libopenvx-imx-dev \ + libnn-imx \ " python __anonymous () { has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT') or '0') @@ -94,6 +93,7 @@ USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" # Inhibit warnings about files being stripped. INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INSANE_SKIP_${BPN} += "already-stripped" # FIXME: The provided binary doesn't provide soname. If in future BSP # release the libraries are fixed, we can drop this hack. @@ -206,6 +206,10 @@ do_install () { install -d ${D}${sysconfdir}/OpenCL/vendors/ install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd + if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then + cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2 + fi + # We'll only have one backend here so we rename it to generic name # and avoid rework in other packages, when possible mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0 @@ -302,15 +306,22 @@ INSANE_SKIP_libgal-imx += "build-deps" FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" -FILES_libgbm-imx_mx8 = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}" +FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS} ${libdir}/gbm_viv${SOLIBS}" FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}" RDEPENDS_libgbm-imx_append_mx8 = " libdrm" FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${SOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" -FILES_libopenvx-imx = "${libdir}/libOpenVX${SOLIBS} ${libdir}/libOpenVXC${SOLIBS} ${libdir}/libOpenVXU${SOLIBS}" -FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libopenVX${SOLIBSDEV}" +FILES_libopenvx-imx = " \ + ${libdir}/libOpenVX*${SOLIBS} \ + ${libdir}/libOpenVXC${SOLIBS} \ + ${libdir}/libOpenVXU${SOLIBS} \ + ${libdir}/libOvx*${SOLIBS} \ + ${libdir}/libovx*${SOLIBS} \ + " +FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libopenVX${SOLIBSDEV} " +RDEPENDS_libopenvx-imx = "libnn-imx" FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" @@ -368,4 +379,7 @@ FILES_imx-gpu-viv-tools = "${bindir}/gmem_info" FILES_imx-gpu-viv-demos = "/opt" INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps" +FILES_libnn-imx = "${libdir}/libNN*${SOLIBS} ${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" +FILES_libnn-imx-dev = "${includedir}/NNRT" + # COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb deleted file mode 100644 index 51212093..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch64.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "a937571f6ecf85bdff1dfb3b6c834ed0" -SRC_URI[sha256sum] = "1eb4ebe2fa11d8fb7beb8fc7046bb57093fd416d0a401608d78cd48b65624fcd" - -COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch32.bb similarity index 60% rename from recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb rename to recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch32.bb index 4876f7cb..402205ba 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.0-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch32.bb @@ -3,9 +3,8 @@ # Released under the MIT license (see COPYING.MIT for the terms) require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc -SRC_URI[md5sum] = "83c40f63358dd3bd9bbc1cd7521bf8fe" -SRC_URI[sha256sum] = "5abfc3b24c1f9d02970064898fb30da705b67bc7e967dbfbf0525c1cc60f2491" -PACKAGE_FP_TYPE = "hardfp" +SRC_URI[md5sum] = "10ebab961b21b1d08b8a17ee9ae42493" +SRC_URI[sha256sum] = "b5c94b56a9f7c84aa084603a6ca21b5f3941b400e4f6ee8558b58c9b9f1aab36" COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch64.bb new file mode 100644 index 00000000..6c265282 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p1.0-aarch64.bb @@ -0,0 +1,6 @@ +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "7c2f504897e6b4495433546ab7d27912" +SRC_URI[sha256sum] = "45852a5c3c61a9215a2ffb7387a6e1cce7ddac6f12513fc77459ad7e1f1b3a27" + +COMPATIBLE_MACHINE = "(mx8)" -- 2.40.1