diff options
| author | Zelan Zou <zelan.zou@nxp.com> | 2026-03-23 00:38:08 +0800 |
|---|---|---|
| committer | Zelan Zou <zelan.zou@nxp.com> | 2026-03-23 10:46:22 +0800 |
| commit | 2a24b8ec37404e9dd22e136faf44d35e55e2b89d (patch) | |
| tree | be0264f7f947f0f43ff18ed03d24859d49fb6e21 /recipes-bsp | |
| parent | 30e0b4da2f3d226071a36ec80baf908e5e2e72bc (diff) | |
| download | meta-freescale-2a24b8ec37404e9dd22e136faf44d35e55e2b89d.tar.gz | |
imx-vpu-hantro: Bump 1.36.0 -> 1.40.0
Signed-off-by: Zelan Zou <zelan.zou@nxp.com>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch | 38 | ||||
| -rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch | 90 | ||||
| -rw-r--r-- | recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb (renamed from recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb) | 12 |
3 files changed, 4 insertions, 136 deletions
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch deleted file mode 100644 index bbfec172a..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From e39a6602817e4221ae09ac3d520ca6a0d94814dc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Max Krummenacher <max.krummenacher@toradex.com> | ||
| 3 | Date: Wed, 7 May 2025 16:13:38 +0000 | ||
| 4 | Subject: [PATCH] basetype.h: make header compatible with c23 | ||
| 5 | |||
| 6 | With C23 bool, true and false are built in keywords and cannot be | ||
| 7 | redefined. | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | ||
| 11 | --- | ||
| 12 | h1_encoder/software/inc/basetype.h | 4 ++++ | ||
| 13 | 1 file changed, 4 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/h1_encoder/software/inc/basetype.h b/h1_encoder/software/inc/basetype.h | ||
| 16 | index 55e46a195b3b..6655ec54481b 100755 | ||
| 17 | --- a/h1_encoder/software/inc/basetype.h | ||
| 18 | +++ b/h1_encoder/software/inc/basetype.h | ||
| 19 | @@ -66,12 +66,16 @@ typedef size_t ptr_t; | ||
| 20 | #define PRT_PTR "x" | ||
| 21 | #endif | ||
| 22 | |||
| 23 | +#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L | ||
| 24 | +/* bool, true and false are keywords. */ | ||
| 25 | +#else | ||
| 26 | #ifndef __cplusplus | ||
| 27 | typedef enum { | ||
| 28 | false = 0, | ||
| 29 | true = 1 | ||
| 30 | } bool; | ||
| 31 | #endif | ||
| 32 | +#endif | ||
| 33 | |||
| 34 | #else /* __symbian__ or __win__ or whatever, customize it to suit well */ | ||
| 35 | |||
| 36 | -- | ||
| 37 | 2.42.0 | ||
| 38 | |||
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch deleted file mode 100644 index da1af2b9c..000000000 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch +++ /dev/null | |||
| @@ -1,90 +0,0 @@ | |||
| 1 | From 0c5bdd12a6f3ba73e605656828bf429966a997ef Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Max Krummenacher <max.krummenacher@toradex.com> | ||
| 3 | Date: Wed, 7 May 2025 13:25:26 +0000 | ||
| 4 | Subject: [PATCH] test: md5: convert to ansi c | ||
| 5 | |||
| 6 | GCC 15 no longer likes this K&R style function declarations. | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | ||
| 10 | --- | ||
| 11 | decoder_sw/software/test/common/swhw/md5.c | 15 +++++---------- | ||
| 12 | decoder_sw/software/test/common/swhw/md5.h | 8 ++++---- | ||
| 13 | 2 files changed, 9 insertions(+), 14 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/decoder_sw/software/test/common/swhw/md5.c b/decoder_sw/software/test/common/swhw/md5.c | ||
| 16 | index c3334bf751fd..20014fbdf268 100755 | ||
| 17 | --- a/decoder_sw/software/test/common/swhw/md5.c | ||
| 18 | +++ b/decoder_sw/software/test/common/swhw/md5.c | ||
| 19 | @@ -42,8 +42,7 @@ | ||
| 20 | /* | ||
| 21 | * Note: this code is harmless on little-endian machines. | ||
| 22 | */ | ||
| 23 | -void ByteReverse(buf, longs) unsigned char *buf; | ||
| 24 | -unsigned longs; | ||
| 25 | +void ByteReverse(unsigned char *buf, unsigned longs) | ||
| 26 | { | ||
| 27 | uint32 t; | ||
| 28 | do { | ||
| 29 | @@ -59,7 +58,7 @@ unsigned longs; | ||
| 30 | * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious | ||
| 31 | * initialization constants. | ||
| 32 | */ | ||
| 33 | -void MD5Init(ctx) struct MD5Context *ctx; | ||
| 34 | +void MD5Init(struct MD5Context *ctx) | ||
| 35 | { | ||
| 36 | ctx->buf[0] = 0x67452301; | ||
| 37 | ctx->buf[1] = 0xefcdab89; | ||
| 38 | @@ -74,9 +73,7 @@ void MD5Init(ctx) struct MD5Context *ctx; | ||
| 39 | * Update context to reflect the concatenation of another buffer full | ||
| 40 | * of bytes. | ||
| 41 | */ | ||
| 42 | -void MD5Update(ctx, buf, len) struct MD5Context *ctx; | ||
| 43 | -unsigned char *buf; | ||
| 44 | -unsigned len; | ||
| 45 | +void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len) | ||
| 46 | { | ||
| 47 | uint32 t; | ||
| 48 | |||
| 49 | @@ -124,8 +121,7 @@ unsigned len; | ||
| 50 | * Final wrapup - pad to 64-byte boundary with the bit pattern | ||
| 51 | * 1 0* (64-bit count of bits processed, MSB-first) | ||
| 52 | */ | ||
| 53 | -void MD5Final(digest, ctx) unsigned char digest[16]; | ||
| 54 | -struct MD5Context *ctx; | ||
| 55 | +void MD5Final(unsigned char digest[16], struct MD5Context *ctx) | ||
| 56 | { | ||
| 57 | unsigned count; | ||
| 58 | unsigned char *p; | ||
| 59 | @@ -186,8 +182,7 @@ struct MD5Context *ctx; | ||
| 60 | * reflect the addition of 16 longwords of new data. MD5Update blocks | ||
| 61 | * the data and converts bytes into longwords for this routine. | ||
| 62 | */ | ||
| 63 | -void MD5Transform(buf, in) uint32 buf[4]; | ||
| 64 | -uint32 in[16]; | ||
| 65 | +void MD5Transform(uint32 buf[4], uint32 in[16]) | ||
| 66 | { | ||
| 67 | register uint32 a, b, c, d; | ||
| 68 | |||
| 69 | diff --git a/decoder_sw/software/test/common/swhw/md5.h b/decoder_sw/software/test/common/swhw/md5.h | ||
| 70 | index 516400236606..c1d773093b66 100755 | ||
| 71 | --- a/decoder_sw/software/test/common/swhw/md5.h | ||
| 72 | +++ b/decoder_sw/software/test/common/swhw/md5.h | ||
| 73 | @@ -76,10 +76,10 @@ struct MD5Context { | ||
| 74 | unsigned char in[64]; | ||
| 75 | }; | ||
| 76 | |||
| 77 | -extern void MD5Init(); | ||
| 78 | -extern void MD5Update(); | ||
| 79 | -extern void MD5Final(); | ||
| 80 | -extern void MD5Transform(); | ||
| 81 | +extern void MD5Init(struct MD5Context *ctx); | ||
| 82 | +extern void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len); | ||
| 83 | +extern void MD5Final(unsigned char digest[16], struct MD5Context *ctx); | ||
| 84 | +extern void MD5Transform(uint32 buf[4], uint32 in[16]); | ||
| 85 | |||
| 86 | /* | ||
| 87 | * This is needed to make RSAREF happy on some MS-DOS compilers. | ||
| 88 | -- | ||
| 89 | 2.42.0 | ||
| 90 | |||
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb index d766e0191..e5113f1c1 100644 --- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb +++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb | |||
| @@ -1,19 +1,17 @@ | |||
| 1 | # Copyright (C) 2017-2020 NXP | 1 | # Copyright (C) 2017-2020,2026 NXP |
| 2 | 2 | ||
| 3 | DESCRIPTION = "i.MX Hantro VPU library" | 3 | DESCRIPTION = "i.MX Hantro VPU library" |
| 4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" |
| 6 | 6 | ||
| 7 | PROVIDES = "virtual/imxvpu" | 7 | PROVIDES = "virtual/imxvpu" |
| 8 | 8 | ||
| 9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
| 10 | ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \ | 10 | ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \ |
| 11 | file://0001-test-md5-convert-to-ansi-c.patch \ | ||
| 12 | file://0001-basetype.h-make-header-compatible-with-c23.patch \ | ||
| 13 | " | 11 | " |
| 14 | IMX_SRCREV_ABBREV = "194a305" | 12 | IMX_SRCREV_ABBREV = "52c7e45" |
| 15 | 13 | ||
| 16 | SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7" | 14 | SRC_URI[sha256sum] = "cdfb28cdec4e26ef84ee8c54be89a1da269eaeb4b51eafe689eb084ac20c7d84" |
| 17 | 15 | ||
| 18 | S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" | 16 | S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}" |
| 19 | 17 | ||
| @@ -43,7 +41,5 @@ do_install () { | |||
| 43 | 41 | ||
| 44 | FILES:${PN} += "/unit_tests" | 42 | FILES:${PN} += "/unit_tests" |
| 45 | 43 | ||
| 46 | RDEPENDS:${PN} += "imx-vpu-hantro-daemon" | ||
| 47 | |||
| 48 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" | 44 | PACKAGE_ARCH = "${MACHINE_SOCARCH}" |
| 49 | COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" | 45 | COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)" |
