From e723b4c36c366ab83307b53c172e331ba0dc4be1 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Tue, 19 Oct 2021 19:00:52 +0000 Subject: [PATCH] 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 --- ...vc_1.4.0.bb => imx-vpu-hantro-vc_1.5.0.bb} | 6 ++-- ...akefile-Honor-LDFLAGS-from-toolchain.patch | 33 ------------------- ....0.0.bb => imx-vpu-hantro-daemon_1.1.0.bb} | 5 ++- ...tro_1.22.0.bb => imx-vpu-hantro_1.23.0.bb} | 6 ++-- 4 files changed, 8 insertions(+), 42 deletions(-) rename recipes-bsp/imx-vpu-hantro-vc/{imx-vpu-hantro-vc_1.4.0.bb => imx-vpu-hantro-vc_1.5.0.bb} (78%) delete mode 100644 recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon/0001-Makefile-Honor-LDFLAGS-from-toolchain.patch rename recipes-bsp/imx-vpu-hantro/{imx-vpu-hantro-daemon_1.0.0.bb => imx-vpu-hantro-daemon_1.1.0.bb} (76%) rename recipes-bsp/imx-vpu-hantro/{imx-vpu-hantro_1.22.0.bb => imx-vpu-hantro_1.23.0.bb} (74%) 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.5.0.bb similarity index 78% rename from recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb rename to recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.5.0.bb index 33208bdf..e6cffaca 100644 --- 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.5.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "i.MX VC8000E Encoder library" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" inherit fsl-eula-unpack @@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" S = "${WORKDIR}/${BPN}-${PV}" -SRC_URI[md5sum] = "b5270450ba2da5b7468b67ae8c0bcdca" -SRC_URI[sha256sum] = "d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3" +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}. 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 dff2fb8f..00000000 --- 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.1.0.bb similarity index 76% rename from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb rename to recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.0.bb index d362fce3..25f54c7a 100644 --- 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.1.0.bb @@ -8,10 +8,9 @@ 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" +SRC_URI[md5sum] = "980237589af195c2c4b852a7aad175ee" +SRC_URI[sha256sum] = "a5d915fefd3637e68d693638edd1161c30e75011a6312251b914f04546fd0fc9" PLATFORM:mx8mm = "IMX8MM" PLATFORM:mx8mq = "IMX8MQ" 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.23.0.bb similarity index 74% rename from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb rename to recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb index 2ecb1e4b..427dbf92 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.23.0.bb @@ -2,13 +2,13 @@ DESCRIPTION = "i.MX Hantro VPU library" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=417b82f17fc02b88125331ed312f6f1b" +LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa" PROVIDES = "virtual/imxvpu" SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "b65b49eadb6463b784e1a9e44a94fca1" -SRC_URI[sha256sum] = "03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00" +SRC_URI[md5sum] = "3f8d4bb593d851d0523d0146131946ae" +SRC_URI[sha256sum] = "a312a0b6d32ed16527e5bfcff362b231069428362ad5710f816bca019f70c6a2" inherit fsl-eula-unpack use-imx-headers -- 2.40.1