From e723b4c36c366ab83307b53c172e331ba0dc4be1 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 19 Oct 2021 19:00:52 +0000 Subject: imx-vpu-hantro[-vc]: upgrade to 5.10.52-2.1.0 Hantro VPU libraries are upgraded to following versions in the NXP release 5.10.52-2.1.0: - imx-vpu-hantro: 1.23.0 - imx-vpu-hantro-daemon: 1.1.0 - imx-vpu-hantro-vc: 1.5.0 Drop patch from imx-vpu-hantro-daemon package build as it has been applied upstream and is present in the updated version. Signed-off-by: Andrey Zhizhikin --- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb | 35 ---------------------- .../imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb | 35 ++++++++++++++++++++++ ...001-Makefile-Honor-LDFLAGS-from-toolchain.patch | 33 -------------------- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb | 32 -------------------- .../imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb | 31 +++++++++++++++++++ .../imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb | 35 ---------------------- .../imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb | 35 ++++++++++++++++++++++ 7 files changed, 101 insertions(+), 135 deletions(-) delete mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb create mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb (limited to 'recipes-bsp') diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb deleted file mode 100644 index 33208bdff..000000000 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2019-2021 NXP - -DESCRIPTION = "i.MX VC8000E Encoder library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" - -inherit fsl-eula-unpack - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" - -S = "${WORKDIR}/${BPN}-${PV}" - -SRC_URI[md5sum] = "b5270450ba2da5b7468b67ae8c0bcdca" -SRC_URI[sha256sum] = "d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3" - -# SCR is the location and name of the Software Content Register file -# relative to ${D}${D_SUBDIR}. -SCR = "SCR.txt" - -do_install () { - install -d ${D}${D_SUBDIR} - cp -r ${S}/* ${D}${D_SUBDIR} - if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then - mv ${D}/usr/lib ${D}${libdir} - fi - rm ${D}${D_SUBDIR}/COPYING - if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then - bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" - fi - rm ${D}${D_SUBDIR}/${SCR} -} - -FILES:${PN} = "/" - -COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb new file mode 100644 index 000000000..e6cffaca7 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2019-2021 NXP + +DESCRIPTION = "i.MX VC8000E Encoder library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" + +S = "${WORKDIR}/${BPN}-${PV}" + +SRC_URI[md5sum] = "fbd43a100c27abbae301428f1ae2bc64" +SRC_URI[sha256sum] = "e59ac2ded726d722f61793b17fc394ce87b1c5710cb79f0b1d60b87fca5829e1" + +# SCR is the location and name of the Software Content Register file +# relative to ${D}${D_SUBDIR}. +SCR = "SCR.txt" + +do_install () { + install -d ${D}${D_SUBDIR} + cp -r ${S}/* ${D}${D_SUBDIR} + if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then + mv ${D}/usr/lib ${D}${libdir} + fi + rm ${D}${D_SUBDIR}/COPYING + if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then + bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" + fi + rm ${D}${D_SUBDIR}/${SCR} +} + +FILES:${PN} = "/" + +COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch deleted file mode 100644 index dff2fb8f4..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 94ae72948f1ed1a8bad1c13b4edc4b9189207e35 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Mon, 26 Jul 2021 09:06:26 -0500 -Subject: [PATCH] Makefile: Honor LDFLAGS from toolchain - -The LDFLAGS variable is standard from the toolchain and should be -honored. Yocto detects the problem with a QA check: - -ERROR: imx-vpu-hantro-daemon-1.1.0-r0 do_package_qa: QA Issue: File /usr/bin/vsidaemon in package imx-vpu-hantro-daemon doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags] - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9a775b0..e73ff47 100755 ---- a/Makefile -+++ b/Makefile -@@ -22,7 +22,7 @@ OUT_FILE = vsidaemon - DEC = nxp_enc_hw - ENC = nxp_dec_hw - LIBFILES = --LD_FLAGS = -lpthread -lm -+LD_FLAGS = $(LDFLAGS) -lpthread -lm - - PLATFORM ?= IMX8MP - --- -2.17.1 - diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb deleted file mode 100644 index d362fce3b..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2021 NXP -DESCRIPTION = "i.MX Hantro V4L2 Daemon" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" - -DEPENDS = "imx-vpu-hantro" -DEPENDS:append:mx8mp = " imx-vpu-hantro-vc" - -SRC_URI = " \ - ${FSL_MIRROR}/${BP}.tar.gz \ - file://0001-Makefile-Honor-LDFLAGS-from-toolchain.patch \ -" -SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2" -SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - CTRLSW_HDRPATH="${STAGING_INCDIR}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb new file mode 100644 index 000000000..25f54c7a1 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb @@ -0,0 +1,31 @@ +# Copyright 2021 NXP +DESCRIPTION = "i.MX Hantro V4L2 Daemon" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1" + +DEPENDS = "imx-vpu-hantro" +DEPENDS:append:mx8mp = " imx-vpu-hantro-vc" + +SRC_URI = " \ + ${FSL_MIRROR}/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee" +SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9" + +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + CTRLSW_HDRPATH="${STAGING_INCDIR}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb deleted file mode 100644 index 2ecb1e4b3..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2017-2020 NXP - -DESCRIPTION = "i.MX Hantro VPU library" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" - -PROVIDES = "virtual/imxvpu" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "b65b49eadb6463b784e1a9e44a94fca1" -SRC_URI[sha256sum] = "03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00" - -inherit fsl-eula-unpack use-imx-headers - -PARALLEL_MAKE="-j 1" - -PLATFORM:mx8mm = "IMX8MM" -PLATFORM:mx8mq = "IMX8MQ" -PLATFORM:mx8mp = "IMX8MP" - -EXTRA_OEMAKE = " \ - CROSS_COMPILE="${HOST_PREFIX}" \ - SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ - PLATFORM="${PLATFORM}" \ -" - -do_install () { - oe_runmake install DEST_DIR="${D}" -} - -FILES:${PN} += "/unit_tests" - -RDEPENDS:${PN} += "imx-vpu-hantro-daemon" - -COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb new file mode 100644 index 000000000..427dbf924 --- /dev/null +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2017-2020 NXP + +DESCRIPTION = "i.MX Hantro VPU library" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" + +PROVIDES = "virtual/imxvpu" + +SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" +SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae" +SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2" + +inherit fsl-eula-unpack use-imx-headers + +PARALLEL_MAKE="-j 1" + +PLATFORM:mx8mm = "IMX8MM" +PLATFORM:mx8mq = "IMX8MQ" +PLATFORM:mx8mp = "IMX8MP" + +EXTRA_OEMAKE = " \ + CROSS_COMPILE="${HOST_PREFIX}" \ + SDKTARGETSYSROOT="${STAGING_DIR_TARGET}" \ + PLATFORM="${PLATFORM}" \ +" + +do_install () { + oe_runmake install DEST_DIR="${D}" +} + +FILES:${PN} += "/unit_tests" + +RDEPENDS:${PN} += "imx-vpu-hantro-daemon" + +COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)" -- cgit v1.2.3-54-g00ecf