From 74fd3be7c0d23cdf0fe227a50b18f3d506f06ce6 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Fri, 26 Jul 2024 18:14:51 +0300 Subject: imx-dpu-g2d: Upgrade imxdpu-g2d from 2.1.12 to 2.1.14 imx-gpu-g2d: Upgrade from 6.4.11.p2.4 to 6.4.11.p2.6 imx-g2d-samples: Update to latest 431f311a imx-pxp-g2d: Update to latest edd234c4e Signed-off-by: Valentin Jec --- recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb | 45 -------------------- recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb | 49 ++++++++++++++++++++++ recipes-graphics/imx-g2d/imx-g2d-samples_git.bb | 2 +- .../imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb | 44 ------------------- .../imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb | 44 +++++++++++++++++++ recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb | 5 ++- 6 files changed, 97 insertions(+), 92 deletions(-) delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb delete mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb create mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb deleted file mode 100644 index b10cd997a..000000000 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.12.bb +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2024 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "G2D library using i.MX DPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" - -DEPENDS = "libdrm ${LIBGAL_IMX}" -LIBGAL_IMX = "libgal-imx" -LIBGAL_IMX:mx95-nxp-bsp = "" - -PROVIDES += "virtual/libg2d" - -SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" -IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" - -IMX_SRCREV_ABBREV = "ee47ef7" -IMX_SRC_URI_NAME = "v1" -SRC_URI[v1.md5sum] = "4150f09e27178101fdccb792b7cbc526" -SRC_URI[v1.sha256sum] = "bd7849376564f7e2eb55210f156afae00b49451de6de80cfbc5fbda15be6a2b0" - -IMX_SRCREV_ABBREV:mx95-nxp-bsp = "ee47ef7" -IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" -SRC_URI[v2.md5sum] = "031396e175c432eb6c84aad8e0a6fc7d" -SRC_URI[v2.sha256sum] = "0646d8cc8e53f22fc15a61f0b78cd5f73460520f91949bc1d29c10ecbf77307b" - -S = "${WORKDIR}/${IMX_BIN_NAME}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} -} - -# 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" - -COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb new file mode 100644 index 000000000..23168ae16 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb @@ -0,0 +1,49 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2024 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX DPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" + +DEPENDS = "libdrm ${LIBGAL_IMX}" +LIBGAL_IMX = "libgal-imx" +LIBGAL_IMX:mx95-nxp-bsp = "" + +PROVIDES += "virtual/libg2d" + +SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}" +IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}" + +IMX_SRCREV_ABBREV = "6a00326" +IMX_SRC_URI_NAME = "v1" +SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c" +SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940" + +IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326" +IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2" +SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09" +SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee" + +S = "${WORKDIR}/${IMX_BIN_NAME}" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +INSANE_SKIP:append:libc-musl = " file-rdeps" +RDEPENDS:${PN}:append:libc-musl = " gcompat" + +# 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" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb index 55f88da39..0f0c18967 100644 --- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb +++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb @@ -10,7 +10,7 @@ PV = "2.1+git${SRCPV}" SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}" GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https" SRCBRANCH = "imx_2.1" -SRCREV = "bec2f3839737b0e83b68b1c976373d9a78e5762f" +SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d" S = "${WORKDIR}/git" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb deleted file mode 100644 index 3ebb8f884..000000000 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.4.bb +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2016 Freescale Semiconductor -# Copyright 2017-2024 NXP -# Copyright 2018 (C) O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "G2D library using i.MX GPU" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=44a8052c384584ba09077e85a3d1654f" -DEPENDS = "libgal-imx" -PROVIDES = "virtual/libg2d" - -SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" -IMX_SRCREV_ABBREV = "b07999b" -SRC_URI[aarch64.md5sum] = "fa30ce75803697d5131d707b300258ee" -SRC_URI[aarch64.sha256sum] = "2dff0279ead132ec5fa61dbe9b2b1969135e8ce9fe7487957371327357d70ac7" -SRC_URI[arm.md5sum] = "c81be7c93b60c7d3f3eb5b7bfeda42a4" -SRC_URI[arm.sha256sum] = "e17ac373193622ec0c9aa490ef1b93551d22a2e88ee9f1098ed984e62f02a06c" - -S = "${WORKDIR}/${IMX_BIN_NAME}" - -inherit fsl-eula-unpack - -SOC_INSTALL_DIR = "SOC_INSTALL_DIR_NOT_SET" -SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm" - -do_install () { - install -d ${D}${libdir} - install -d ${D}${includedir} - cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} - if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then - cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir} - fi - cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} -} - -# 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" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb new file mode 100644 index 000000000..d12d9c1a8 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb @@ -0,0 +1,44 @@ +# Copyright (C) 2016 Freescale Semiconductor +# Copyright 2017-2024 NXP +# Copyright 2018 (C) O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "G2D library using i.MX GPU" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" +DEPENDS = "libgal-imx" +PROVIDES = "virtual/libg2d" + +SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" +IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}" +IMX_SRCREV_ABBREV = "bc7b6a2" +SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f" +SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918" +SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2" +SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663" + +S = "${WORKDIR}/${IMX_BIN_NAME}" + +inherit fsl-eula-unpack + +SOC_INSTALL_DIR = "SOC_INSTALL_DIR_NOT_SET" +SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm" + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir} + if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then + cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir} + fi + cp -Pr ${S}/g2d/usr/include/* ${D}${includedir} +} + +# 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" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb index 50c37a2c5..4481188b1 100644 --- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb +++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "G2D library using i.MX PXP" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44a8052c384584ba09077e85a3d1654f" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a" PROVIDES += "virtual/libg2d" @@ -13,7 +13,7 @@ PV = "2.1.0+git${SRCPV}" SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}" IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https" SRCBRANCH = "imx_2.1" -SRCREV = "9f9f41fa0e86757f856e1ec7824f56022fe94586" +SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07" S = "${WORKDIR}/git" @@ -25,4 +25,5 @@ do_install() { oe_runmake install } +PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(mx93-nxp-bsp)" -- cgit v1.2.3-54-g00ecf