From 7ecb29f5f56c9c247d331f650f1a463f76457290 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 17 Dec 2021 13:54:40 +0100 Subject: [PATCH] hardknott: imx-gpu-viv: sync with meta-imx hardknott-5.10.72-2.2.0 branch Update to v6.4.3.p2.4 Signed-off-by: Gabriel Valcazar --- .../imx-gpu-viv/imx-gpu-viv-6-overrides.inc | 49 +++ .../imx-gpu-viv/imx-gpu-viv-6.inc | 367 ------------------ .../imx-gpu-viv/Add-dummy-libgl.patch | 6 - .../imx-gpu-viv_6.4.3.p1.2-aarch32.bb | 8 - .../imx-gpu-viv_6.4.3.p1.2-aarch64.bb | 8 - .../imx-gpu-viv_6.4.3.p2.4-aarch32.bb | 8 + .../imx-gpu-viv_6.4.3.p2.4-aarch64.bb | 8 + 7 files changed, 65 insertions(+), 389 deletions(-) create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch32.bb delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch64.bb create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc new file mode 100644 index 000000000..ccca9fc89 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc @@ -0,0 +1,49 @@ +require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc + +PACKAGECONFIG ?= "valgrind" + +INHIBIT_SYSROOT_STRIP = "1" + +IMX_SOC = "IMX_SOC_NOT_SET" +IMX_SOC_mx8qm = "mx8qm" +IMX_SOC_mx8mp = "mx8mp" +IMX_SOC_mx8mq = "mx8mq" +IMX_SOC_mx8qxp = "mx8qxp" +IMX_SOC_mx8mn = "mx8mn" +IMX_SOC_mx8ulp = "mx8ulp" + +do_install_append() { + if [ -d ${S}/gpu-core/usr/lib/${IMX_SOC} ]; then + cp -r ${S}/gpu-core/usr/lib/${IMX_SOC}/* ${D}${libdir} + fi + # Undo removals + for header in ${GLES3_HEADER_REMOVALS}; do + cp ${S}/gpu-core/usr/include/GLES3/${header} ${D}${includedir}/GLES3 + done +} + +# dri and libVDK.so are removed, make a workaround so base install is not broken +do_install_prepend() { + mkdir -p ${S}/gpu-core/usr/lib/dri + mkdir -p ${S}/gpu-core/usr/lib/fb + touch ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 +} +do_install_append() { + rm -rf ${D}${libdir}/dri + rm -f ${D}${libdir}/libVDK-fb.so.1.2.0 +} + +RDEPENDS_libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}" + +FILES_libnn-imx_remove = "${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" + +FILES_libvulkan-imx += "${libdir}/libvulkan_VSI${SOLIBS}" +INSANE_SKIP_libvulkan-imx += "dev-so" +FILES_libopenvx-imx += "${libdir}/libOpenVX${SOLIBS}" +INSANE_SKIP_libopenvx-imx += "dev-so dev-deps" +FILES_libopencl-imx += "${libdir}/libOpenCL${SOLIBS}" +INSANE_SKIP_libopencl-imx += "dev-so dev-deps" +FILES_libopenvg-imx += "${libdir}/libOpenVG*${SOLIBS}" +INSANE_SKIP_libopenvg-imx += "dev-so" +FILES_libvdk-imx += "${libdir}/libVDK*${SOLIBS}" +INSANE_SKIP_libvdk-imx += "dev-so" diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc deleted file mode 100644 index dcf637b57..000000000 --- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2012-2018 O.S. Systems Software LTDA. -# Copyright 2017-2019 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "GPU driver and apps for i.MX" -SECTION = "libs" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28" - -DEPENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes', \ - '', d), d)} \ -" -DEPENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \ - '', d)} \ -" -DEPENDS_append_imxdrm = " libdrm wayland" -DEPENDS_append_mx8 = " patchelf-native" - -# imx-gpu-viv does not provide everything it needs to for virtual/libgl -# on x11 backend or on Wayland backend with XWayland support. -# We depend on mesa to fill in what is missing. -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}" - -EXTRA_PROVIDES = "" -EXTRA_PROVIDES_append_imxgpu3d = " \ - virtual/libgl \ - virtual/libgles1 \ - virtual/libgles2 \ -" -EXTRA_PROVIDES_append_mx8 = " \ - virtual/libgbm \ -" -PROVIDES_OPENVX = "" -PROVIDES_OPENVX_mx8 = "virtual/libopenvx" -PROVIDES_OPENVX_mx8mm = "" -PROVIDES += " \ - imx-gpu-viv \ - libgal-imx \ - opencl-headers \ - virtual/egl \ - virtual/libopenvg \ - virtual/opencl-headers \ - virtual/opencl-icd \ - ${EXTRA_PROVIDES} \ - ${PROVIDES_OPENVX} \ -" - -RPROVIDES_${PN}_imxgpu3d += "imx-gpu-viv" - -PE = "1" - -inherit fsl-eula-unpack features_check - -REQUIRED_DISTRO_FEATURES_mx8 = "wayland" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" - -# Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below -IMX_PACKAGES_GBM = "" -IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev" -PACKAGES =+ "libclc-imx libclc-imx-dev \ - libgl-imx libgl-imx-dev \ - libgles1-imx libgles1-imx-dev \ - libgles2-imx libgles2-imx-dev \ - libgles3-imx-dev \ - libglslc-imx libglslc-imx-dev \ - libopencl-imx libopencl-imx-dev \ - libopenvg-imx libopenvg-imx-dev \ - libvdk-imx libvdk-imx-dev \ - libegl-imx libegl-imx-dev \ - libgal-imx libgal-imx-dev \ - libvivante-dri-imx \ - libvsc-imx \ - ${IMX_PACKAGES_GBM} \ - libwayland-viv-imx libwayland-viv-imx-dev \ - libgc-wayland-protocol-imx libgc-wayland-protocol-imx-dev \ - imx-gpu-viv-tools \ - 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') - if has_vivante_kernel_driver_support != '1': - raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') -} - -USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" -USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" - -# The packaged binaries have been stripped of debug info, so disable -# operations accordingly. -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_SYSROOT_STRIP = "1" - -# FIXME: The provided binary doesn't provide soname. If in future BSP -# release the libraries are fixed, we can drop this hack. -REALSOLIBS := "${SOLIBS}" -SOLIBS = "${SOLIBSDEV}" - -python __anonymous() { - # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have - # the source we cannot fix it. Disable the insane check for now. - packages = d.getVar('PACKAGES').split() - for p in packages: - d.appendVar("INSANE_SKIP_%s" % p, " ldflags") - - # For the packages that make up the OpenGL interfaces, inject variables so that - # they don't get Debian-renamed (which would remove the -imx suffix). - for p in (("libegl", "libegl1"), ("libgl", "libgl1"), - ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), - ("libgles3",), ("libgbm",)): - fullp = p[0] + "-imx" - pkgs = "".join(' %s' % i for i in p) - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) - - # For -dev, the first element is both the Debian and original name - fullp += "-dev" - pkgs = p[0] + "-dev" - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) -} - -IS_MX6SL = "0" -IS_MX6SL_mx6sl = "1" - -IS_MX8 = "0" -IS_MX8_mx8 = "1" - -PACKAGE_FP_TYPE = "hardfp" - -HAS_GBM = "false" -HAS_GBM_mx8 = "true" - -GLES3_HEADER_REMOVALS = "gl31.h gl32.h" -GLES3_HEADER_REMOVALS_mx8m = "gl32.h" -GLES3_HEADER_REMOVALS_mx8mm = "gl31.h gl32.h" -GLES3_HEADER_REMOVALS_mx8qxp = "" -GLES3_HEADER_REMOVALS_mx8qm = "" - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - install -d ${D}${bindir} - - cp -P ${S}/gpu-core/usr/lib/*.so* ${D}${libdir} - cp -r ${S}/gpu-core/usr/include/* ${D}${includedir} - cp -r ${S}/gpu-demos/opt ${D} - cp -r ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir} - - # Use vulkan header from vulkan-headers recipe to support vkmark - rm -rf ${D}${includedir}/vulkan/ - - install -d ${D}${libdir}/pkgconfig - if ${HAS_GBM}; then - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc - fi - - # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb - if [ "${USE_WL}" = "yes" ]; then - - backend=wayland - - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc - 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_X11}" = "yes" ]; then - - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - - fi - - elif [ "${USE_X11}" = "yes" ]; then - - cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} - - backend=x11 - - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl_x11.pc ${D}${libdir}/pkgconfig/gl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc - - else - 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 - - # Regular framebuffer - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc - - backend=fb - - fi - - # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader) - install -d ${D}${sysconfdir}/OpenCL/vendors/ - install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd - - # Handle backend specific drivers - cp -r ${S}/gpu-core/usr/lib/${backend}/* ${D}${libdir} - if [ "${USE_WL}" = "yes" ]; then - # Special case for libVDK on Wayland backend, deliver fb library as well. - cp ${S}/gpu-core/usr/lib/fb/libVDK.so.1.2.0 ${D}${libdir}/libVDK-fb.so.1.2.0 - fi - if [ "${IS_MX8}" = "1" ]; then - # Rename our libvulkan.so so it doesn't clash with vulkan-loader libvulkan.so - mv ${D}${libdir}/libvulkan.so.1.1.6 ${D}${libdir}/libvulkan_VSI.so.1.1.6 - patchelf --set-soname libvulkan_VSI.so.1 ${D}${libdir}/libvulkan_VSI.so.1.1.6 - ln -sf libvulkan_VSI.so.1.1.6 ${D}${libdir}/libvulkan_VSI.so.1 - ln -sf libvulkan_VSI.so.1.1.6 ${D}${libdir}/libvulkan_VSI.so - rm ${D}${libdir}/libvulkan.so* - fi - for header in ${GLES3_HEADER_REMOVALS}; do - rm -f ${D}${includedir}/GLES3/${header} - done - - # skip packaging wayland libraries if no support is requested - if [ "${USE_WL}" = "no" ]; then - find ${D}${libdir} -name "libgc_wayland_protocol.*" -exec rm '{}' ';' - find ${D}${libdir} -name "libwayland-viv.*" -exec rm '{}' ';' - fi - - # FIXME: MX6SL does not have 3D support; hack it for now - if [ "${IS_MX6SL}" = "1" ]; then - rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ - \ - ${D}${libdir}/libGL* ${D}${includedir}/GL* ${D}${libdir}/pkgconfig/gl.pc \ - \ - ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \ - \ - ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \ - \ - ${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.2d.so ${D}${libdir}/libOpenVG.so - fi - - find ${D}${libdir} -type f -exec chmod 644 {} \; - find ${D}${includedir} -type f -exec chmod 644 {} \; - - chown -R root:root "${D}" -} - -ALLOW_EMPTY_${PN} = "1" - -FILES_libclc-imx = "${libdir}/libCLC${SOLIBS} ${includedir}/CL/cl_viv_vx_ext.h" -FILES_libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" - -# libEGL.so is used by some demo apps from Freescale -INSANE_SKIP_libegl-imx += "dev-so" -FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " -FILES_libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" - -FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" -FILES_libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL" -RDEPENDS_libgal-imx += "kernel-module-imx-gpu-viv" -RDEPENDS_libgal-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'valgrind', '', d)}" -RPROVIDES_libgal-imx += "libgal-imx" -INSANE_SKIP_libgal-imx += "build-deps" - -FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" - -FILES_libgbm-imx_mx8 = "${libdir}/libgbm${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" -FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -RDEPENDS_libgbm-imx_append_mx8 = " libdrm" -INSANE_SKIP_libgbm-imx += "dev-so" - -FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${SOLIBS} ${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" -FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" -INSANE_SKIP_libvulkan-imx += "dev-so" - -FILES_libopenvx-imx = "${libdir}/libOpenVX${SOLIBS} ${libdir}/libOpenVX${REALSOLIBS} ${libdir}/libOvx*${SOLIBS} ${libdir}/libOpenVXC${SOLIBS} ${libdir}/libOpenVXU${SOLIBS} ${libdir}/libArchModelSw${SOLIBS}" -FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}" -RDEPENDS_libopenvx-imx = "libnn-imx" -INSANE_SKIP_libopenvx-imx += "dev-so dev-deps" - -FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" -FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" -INSANE_SKIP_libgl-imx += "file-rdeps" - -# libEGL needs to open libGLESv1.so -INSANE_SKIP_libgles1-imx += "dev-so" -FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" -FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" -RPROVIDES_libgles1-imx = "libgles-imx" -RPROVIDES_libgles1-imx-dev = "libgles-imx-dev" - -# libEGL needs to open libGLESv2.so -INSANE_SKIP_libgles2-imx += "dev-so" -FILES_libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" -FILES_libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" -RDEPENDS_libgles2-imx = "libglslc-imx" - -FILES_libgles3-imx-dev = "${includedir}/GLES3" -# as long as there is no libgles3: ship libgles3-dev along with -# libgles2-dev - otherwise GLES3 headers have to be added manually -RDEPENDS_libgles2-imx-dev += "libgles3-imx-dev" - -FILES_libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" -FILES_libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" - -FILES_libopencl-imx = "${libdir}/libOpenCL${SOLIBS} \ - ${libdir}/libOpenCL${REALSOLIBS} \ - ${libdir}/libVivanteOpenCL${SOLIBS} \ - ${libdir}/libLLVM_viv${SOLIBS} \ - ${sysconfdir}/OpenCL/vendors/Vivante.icd" -FILES_libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}" -RDEPENDS_libopencl-imx= "libclc-imx" -INSANE_SKIP_libopencl-imx += "dev-so dev-deps" - -FILES_libnn-imx = "${libdir}/libNN*${SOLIBS}" - -INSANE_SKIP_libopenvg-imx += "dev-so" -FILES_libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS} ${libdir}/libOpenVG*${SOLIBS}" -FILES_libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc" -RDEPENDS_libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}" - -FILES_libvdk-imx = "${libdir}/libVDK*${REALSOLIBS} ${libdir}/libVDK*${SOLIBS}" -FILES_libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" -INSANE_SKIP_libvdk-imx += "dev-so" - -FILES_libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" -RDEPENDS_libvivante-dri-imx = "libdrm" - -INSANE_SKIP_libwayland-viv-imx += "dev-so" -FILES_libwayland-viv-imx = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" -FILES_libwayland-viv-imx-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" -RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imx-vivante', '', d)}" - -INSANE_SKIP_libgc-wayland-protocol-imx += "dev-so" -FILES_libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}" -FILES_libgc-wayland-protocol-imx-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc" - -FILES_imx-gpu-viv-tools = "${bindir}/gmem_info" - -FILES_imx-gpu-viv-demos = "/opt" -INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps" - -# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" - -# Digi custom change: we include the imx-gpu-viv driver as built-in in the -# kernel, so this dependency isn't necessary -RDEPENDS_libgal-imx_remove = "kernel-module-imx-gpu-viv" - -# Remove wayland as a requirement to build framebuffer images -REQUIRED_DISTRO_FEATURES_mx8_remove = "wayland" - diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch deleted file mode 100644 index 36d61ac5b..000000000 --- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch +++ /dev/null @@ -1,6 +0,0 @@ -Index: imx-gpu-viv-6.4.0.p0.2-aarch32/gpu-core/usr/lib/libGL.so.1.2 -=================================================================== ---- /dev/null -+++ imx-gpu-viv-6.4.0.p0.2-aarch32/gpu-core/usr/lib/libGL.so.1.2 -@@ -0,0 +1 @@ -+dummy diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch32.bb deleted file mode 100644 index 320a3ad16..000000000 --- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch32.bb +++ /dev/null @@ -1,8 +0,0 @@ -require imx-gpu-viv-6.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" - -SRC_URI[md5sum] = "89ab16597debb8973f228e49218c99d9" -SRC_URI[sha256sum] = "0f139f5544250a3059c0a0266d44f70e89632694861de3e186272b170b37c464" - -COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch64.bb deleted file mode 100644 index a0c758097..000000000 --- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.2-aarch64.bb +++ /dev/null @@ -1,8 +0,0 @@ -require imx-gpu-viv-6.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a" - -SRC_URI[md5sum] = "b493310ff4548a28b1ac297ab49309a7" -SRC_URI[sha256sum] = "3de60afb1f54c0888d9849c5a27f938ba229f9f35675456a173bdf00e3538c5d" - -COMPATIBLE_MACHINE = "(mx8)" diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb new file mode 100644 index 000000000..e029d9278 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch32.bb @@ -0,0 +1,8 @@ +require imx-gpu-viv-6-overrides.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +SRC_URI[md5sum] = "d577c4e34df73855ebf1c3b3be206f40" +SRC_URI[sha256sum] = "a0266612e8c9ca64b417047274941c867de1058db6709170d0bb5c8b8a38eab1" + +COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb new file mode 100644 index 000000000..ce61a0895 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p2.4-aarch64.bb @@ -0,0 +1,8 @@ +require imx-gpu-viv-6-overrides.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=03bcadc8dc0a788f66ca9e2b89f56c6f" + +SRC_URI[md5sum] = "d53371c1a9a504ff15f747e725164dcb" +SRC_URI[sha256sum] = "6106133afed40327b65d3eec0c197d214ff8f28f8ce3cad94653be4bffb9f9d4" + +COMPATIBLE_MACHINE = "(mx8)"