Merge pull request #1312 from Freescale/backport-1310-to-kirkstone

[Backport kirkstone] Upgrade Multimedia Packages to lf5.15.52_2.1.0

23 files changed, 187 insertions, 112 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b32267ce..1a3a83d4 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -495,7 +495,7 @@ PREFERRED_VERSION_optee-client:mx8-nxp-bsp ??= "3.17.0.imx"
 PREFERRED_VERSION_optee-test:mx8-nxp-bsp   ??= "3.17.0.imx"
 
 #Use i.MX opencv Version for mx8
-PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.5.2.imx"
+PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb
index dc5a0e5c..26ebf181 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.8.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.9.0.bb
@@ -1,8 +1,8 @@
-# Copyright (C) 2019-2021 NXP
+# Copyright 2019-2022 NXP
 
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 inherit fsl-eula-unpack
 
@@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-SRC_URI[md5sum] = "228b06302ad0f0da13a160573c06bbf4"
-SRC_URI[sha256sum] = "537fdbc20fbd1fb561b9a0d01ad843ea25c46e5a5cd184960fc9f1074674ddce"
+SRC_URI[md5sum] = "192b354d1c21836dc7338606e60b45ae"
+SRC_URI[sha256sum] = "62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa"
 
 # 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_1.1.3.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb
index 30c31a2e..b5e1d0e1 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.3.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.1.4.bb
@@ -7,8 +7,8 @@ DEPENDS = "imx-vpu-hantro"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz"
-SRC_URI[md5sum] = "657af53a73fa9898ef7725dd26934079"
-SRC_URI[sha256sum] = "75f857ddfc53341c425d6dac0e6eb9b5c0281b90b6f6de3ff1b64962d52399c5"
+SRC_URI[md5sum] = "e4bdaa1e064e3959576f7dd5a2d89389"
+SRC_URI[sha256sum] = "83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8"
 
 PLATFORM:mx8mm-nxp-bsp = "IMX8MM"
 PLATFORM:mx8mq-nxp-bsp = "IMX8MQ"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch
new file mode 100644
index 00000000..861230bb
--- /dev/null
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-buildsystem-don-t-ignore-externally-set-cflags.patch
@@ -0,0 +1,49 @@
+From aba22ec2e285cf7557a5049fa6181e82e7f1a489 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Mon, 21 Nov 2022 12:04:09 +0000
+Subject: [PATCH] buildsystem: don't ignore externally set cflags
+
+Upstream-Status: pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ decoder_sw/software/linux/h264high/Makefile | 4 ++--
+ decoder_sw/software/linux/vp6/Makefile      | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/decoder_sw/software/linux/h264high/Makefile b/decoder_sw/software/linux/h264high/Makefile
+index 556ff71..7bdd99d 100755
+--- a/decoder_sw/software/linux/h264high/Makefile
++++ b/decoder_sw/software/linux/h264high/Makefile
+@@ -50,10 +50,10 @@ CLEAR_HDRINFO_IN_SEEK = n
+ DEBUG = y
+ # Add your debugging flag (or not) to CFLAGS
+ ifeq ($(DEBUG),y)
+-  CFLAGS   = $(M32) -g -O0
++  CFLAGS   += $(M32) -g -O0
+   DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_RANGE_CHECK -D_ERROR_PRINT
+ else
+-  CFLAGS   = $(M32) -O3
++  CFLAGS   += $(M32) -O3
+   DEBFLAGS = -DNDEBUG
+ endif
+ 
+diff --git a/decoder_sw/software/linux/vp6/Makefile b/decoder_sw/software/linux/vp6/Makefile
+index b6e6914..b933d46 100755
+--- a/decoder_sw/software/linux/vp6/Makefile
++++ b/decoder_sw/software/linux/vp6/Makefile
+@@ -50,10 +50,10 @@ DEBUG = y
+ 
+ # Add your debugging flag (or not) to CFLAGS
+ ifeq ($(DEBUG),y)
+-  CFLAGS   = -g -O0
++  CFLAGS   += -g -O0
+   DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_ERROR_PRINT
+ else
+-  CFLAGS   = -O3
++  CFLAGS   += -O3
+   DEBFLAGS = -DNDEBUG
+ endif
+ 
+-- 
+2.35.3
+
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb
index ac30b60f..35adecf8 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.26.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.27.0.bb
@@ -2,13 +2,16 @@
 
 DESCRIPTION = "i.MX Hantro VPU library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 PROVIDES = "virtual/imxvpu"
 
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "8d06cdacd7700e9e4c32644bf9804cdd"
-SRC_URI[sha256sum] = "0cf9193923e110d2d9e6576e2c632f1675f0751b4c3de9ef54f32813f442540a"
+SRC_URI = " \
+    ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \
+    file://0001-buildsystem-don-t-ignore-externally-set-cflags.patch \
+"
+SRC_URI[md5sum] = "cfa0e92da0eca9cf622c4d7abc618cef"
+SRC_URI[sha256sum] = "7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3"
 
 inherit fsl-eula-unpack use-imx-headers
 
diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb
index 41e59fc9..e19ad6af 100644
--- a/recipes-bsp/isp-imx/basler-camera_4.2.2.18.0.bb
+++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.19.0.bb
@@ -2,14 +2,14 @@
 
 DESCRIPTION = "Basler camera binary drivers"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 inherit fsl-eula-unpack
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "4bc72b07f608cbe13d318a63adb8f9dc"
-SRC_URI[sha256sum] = "62393bcc11b6e8bb9918a29240fb57057870ec0cefff00042ee65d8a1fde081a"
+SRC_URI[md5sum] = "99962b0cbba53ef773b7ac8cb50ce05a"
+SRC_URI[sha256sum] = "fd2f71c854134683ac293393255d61b985e75d8dae2e090c99c21dff756017fb"
 
 do_install() {
     dest_dir=${D}/opt/imx8-isp/bin
diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb
index 177caa14..19d0cba7 100644
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.18.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.19.0.bb
@@ -2,12 +2,12 @@
 
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 DEPENDS = "libdrm virtual/libg2d libtinyxml2"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "a20171db4bf2be423a587f3b610f0a69"
-SRC_URI[sha256sum] = "468ae51223d1873a1a756a1e64a53c0c61ebd640b3810f3a9e912b6a0de6c3c8"
+SRC_URI[md5sum] = "d0350ad40df96a84efc4802975f92c91"
+SRC_URI[sha256sum] = "5544aef41546906bc4999de1980e4706cf241c93732633efde57b018ac4863c3"
 
 inherit fsl-eula-unpack cmake systemd use-imx-headers
 
@@ -25,6 +25,7 @@ SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
 EXTRA_OECMAKE += " \
     -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \
     -DCMAKE_BUILD_TYPE=release \
+    -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
     -DISP_VERSION=ISP8000NANO_V1802 \
     -DPLATFORM=ARM64 \
     -DAPPMODE=V4L2 \
@@ -45,11 +46,13 @@ do_install() {
     install -d ${D}/${libdir}
     install -d ${D}/${includedir}
     install -d ${D}/opt/imx8-isp/bin
+    install -d ${D}/opt/imx8-isp/bin/dewarp_config
 
     cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin
+    cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin
     cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir}
@@ -81,8 +84,6 @@ FILES_SOLIBS_VERSIONED = " \
 FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
 FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}"
 
-INSANE_SKIP:${PN} = "rpaths"
-
 RDEPENDS:${PN} = "libdrm"
 
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb
deleted file mode 100644
index 078f6a61..00000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.18.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2020-2021 NXP
-
-DESCRIPTION = "Kernel loadable module for ISP"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
-
-SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
-ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-5.15.y_2.0.0"
-SRCREV = "551415470092d6af1d7e11e7a78591f5800333f9"
-
-S = "${WORKDIR}/git/vvcam/v4l2"
-
-inherit module
-
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb
new file mode 100644
index 00000000..05431165
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.19.0.bb
@@ -0,0 +1,24 @@
+# Copyright 2020-2021 NXP
+
+DESCRIPTION = "Kernel loadable module for ISP"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
+
+SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
+ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
+SRCBRANCH = "lf-5.15.y_2.1.0"
+SRCREV = "b26ee8a5402afd7488716e06d82147669c05eb4a"
+
+S = "${WORKDIR}/git/vvcam/v4l2"
+DEBUG_PREFIX_MAP = "-fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${STAGING_DIR_HOST}= \
+ -fmacro-prefix-map=${STAGING_DIR_HOST}= \
+ -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
+"
+
+inherit module
+
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb
index 00747f72..827dc94a 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp89xx_git.bb
@@ -2,10 +2,10 @@ SUMMARY = "NXP Wi-Fi driver for module 88w8997/8987"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77"
 
-SRCBRANCH = "lf-5.10.72_2.2.0"
-MRVL_SRC ?= "git://source.codeaurora.org/external/imx/mwifiex.git;protocol=https"
+SRCBRANCH = "lf-5.15.52_2.1.0"
+MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
-SRCREV = "3c2a3c2cd25e9dce95f34c21bb4e728647eb64ee"
+SRCREV = "5cda905576fd26eca6b49d0f0fb5e2bb3c0bf441"
 
 S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
 
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index 1a53131d..38d00b8e 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -1,5 +1,5 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright (C) 2017-2019 NXP
+# Copyright 2013-2016 Freescale Semiconductor
+# Copyright 2017-2022 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -19,9 +19,9 @@ inherit autotools pkgconfig use-imx-headers
 
 PV = "1.0.26+${SRCPV}"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
-SRCREV = "0f32bca96f7027c0c1145b27d1790541d34fb84c"
+SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
+SRCREV = "a9643b8820dd89b7a8c99941a90e9498f1b68c14"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb
index 5f422a1f..71160fad 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb
@@ -184,9 +184,9 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
            file://0005-msdk-fix-includedir-path.patch \
            "
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
-GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
-SRCREV = "63a55f06f7e8f21b483c6d70d50389beb2e85e37"
+GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
+SRCREV = "a9c9d17bb3fc94f49f9c17fd965090949b7ba1cd"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
index 3cbd2179..e025b582 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
@@ -113,9 +113,9 @@ SRC_URI:remove = " \
     file://0003-viv-fb-Make-sure-config.h-is-included.patch \
     file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
-GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
-SRCREV = "4b8559690bf7a66745cc65900baccd955b436d3c"
+GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
+SRCREV = "db100facd1b3601c225bfac2fae7abc9f7a5f92c"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb
index cb762982..4b38fda2 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb
@@ -99,9 +99,9 @@ DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', '
 
 SRC_URI:remove  = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz"
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
-GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
-SRCREV = "4c58a36cfd4b2b16d8978b9592145fb46bb58732"
+GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
+SRCREV = "b83d1e4a3cd702bbe0cf4544aa2acc55796e4a0f"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb
index 3c9424e2..464b8ce0 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb
@@ -88,8 +88,8 @@ DEFAULT_PREFERENCE = "-1"
 # Use i.MX fork of GST for customizations
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
-GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
+GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
 SRCREV = "7afc123bc6974d68795f97466eb83ec7a093fb9b"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.0.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.1.bb
index 585113a4..d174b70c 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.0.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.1.bb
@@ -22,9 +22,9 @@ RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
 LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
-SRC_URI = "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
-SRCREV = "d0b26997556983c99d7b3e7663577f090df36240"
+SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
+SRCREV = "f4410b70e8cb49ec0d522bb0681c5d9178cfc216"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.7.0.bb b/recipes-multimedia/imx-codec/imx-codec_4.7.1.bb
index e192c64d..168878db 100644
--- a/recipes-multimedia/imx-codec/imx-codec_4.7.0.bb
+++ b/recipes-multimedia/imx-codec/imx-codec_4.7.1.bb
@@ -5,14 +5,14 @@
 DESCRIPTION = "Freescale Multimedia codec libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 # Backward compatibility
 PROVIDES += "libfslcodec"
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "5041d6e438c7779dcb424aedc11dd3ef"
-SRC_URI[sha256sum] = "71bcb80bda44a326704d18b2e828b03c6f70792a4bf0686abc223657061df89b"
+SRC_URI[md5sum] = "a905c211e352c6d2f511603e21c6ec26"
+SRC_URI[sha256sum] = "e7ab2c84d3d0d0eff258c45c15a27e3bb22082e73b41cf9d169a68dbdd705529"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.0.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.1.bb
index f383615d..1ee90c38 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.0.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.1.bb
@@ -2,14 +2,14 @@
 
 DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "371a550b9ade88cf355d45c68813f375"
-SRC_URI[sha256sum] = "4307c0a625c73a1a1e5ab321834488d52471c434807ab81b9dd038b4cff5903b"
+SRC_URI[md5sum] = "bb533c612e688d1ad0de028f19fefbf5"
+SRC_URI[sha256sum] = "8f26dd1bdd08c4136da0fd67342cbac1c5c2f95a0dc33b1d71a64e0f8e1938a7"
 
 # Fix strip command failed: 'Unable to recognise the format of the input file'
 INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb
index 168ec603..9e634b60 100644
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.0.0.bb
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.0.1.bb
@@ -2,14 +2,14 @@
 
 DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
 
-SRC_URI[md5sum] = "34f77ef1078b842e4cd67dc87c4c35a1"
-SRC_URI[sha256sum] = "c484a29ab880e8f7ec84d7df736bfa37817c41e64802f07140e9752ba9cd7956"
+SRC_URI[md5sum] = "71e18d4518551f665fa0258ccf6605b0"
+SRC_URI[sha256sum] = "7441cf3cbdc12058f2841a708b1374c637d2a171cca17a348338ebf4580a417e"
 
 EXTRA_OECONF = " \
     -datadir=${base_libdir}/firmware \
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.7.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.7.1.bb
index 55402bb6..8b3a39ed 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.7.0.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.7.1.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -14,8 +14,8 @@ RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
 
 SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "5054251389f43702fd29da9668bd3dea"
-SRC_URI[sha256sum] = "caf2757baa936ffe0e992f8e6c3121932f5b497cebfbf20048ba93b26626c4d7"
+SRC_URI[md5sum] = "33341cfbc387a881d82c5197b86a4544"
+SRC_URI[sha256sum] = "680080293df869393028c58ccb2642b724f4b2297f2cbd7b98877a81e4cd6d03"
 
 inherit fsl-eula-unpack autotools pkgconfig
 
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index 240eab49..e2c69082 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -1,18 +1,18 @@
 # Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright (C) 2017-2021 NXP
+# Copyright 2017-2022 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
 
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 
 SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.07.00_2205_L5.15.y"
-SRCREV = "0e417b0ade3e55b5fb639d20c419b05aa31ab329"
+SRCBRANCH = "MM_04.07.01_2208_L5.15.y"
+SRCREV = "bb1a5f300eec0b89d7127446eb78d479c23ff7da"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
index 0e83e994..ef7831a5 100644
--- a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
+++ b/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch
@@ -31,7 +31,7 @@ Index: git/samples/dnn/classification.cpp
 ===================================================================
 --- git.orig/samples/dnn/classification.cpp
 +++ git/samples/dnn/classification.cpp
-@@ -11,6 +11,7 @@ std::string keys =
+@@ -12,6 +12,7 @@ std::string keys =
      "{ help  h          | | Print help message. }"
      "{ @alias           | | An alias name of model to extract preprocessing parameters from models.yml file. }"
      "{ zoo              | models.yml | An optional path to file with preprocessing parameters }"
@@ -39,7 +39,7 @@ Index: git/samples/dnn/classification.cpp
      "{ input i          | | Path to input image or video file. Skip this argument to capture frames from a camera.}"
      "{ initial_width    | 0 | Preprocess input image by initial resizing to a specific width.}"
      "{ initial_height   | 0 | Preprocess input image by initial resizing to a specific height.}"
-@@ -102,7 +103,7 @@ int main(int argc, char** argv)
+@@ -113,7 +114,7 @@ int main(int argc, char** argv)
      if (parser.has("input"))
          cap.open(parser.get<String>("input"));
      else
@@ -48,19 +48,21 @@ Index: git/samples/dnn/classification.cpp
      //! [Open a video file or an image file or a camera stream]
  
      // Process frames.
-@@ -151,13 +152,13 @@ int main(int argc, char** argv)
-         double freq = getTickFrequency() / 1000;
-         double t = net.getPerfProfile(layersTimes) / freq;
-         std::string label = format("Inference time: %.2f ms", t);
+@@ -195,14 +196,14 @@ int main(int argc, char** argv)
+         }
+         std::string label = format("Inference time of 1 round: %.2f ms", t1);
+         std::string label2 = format("Average time of 200 rounds: %.2f ms", timeRecorder.getTimeMilli()/200);
 -        putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0));
+-        putText(frame, label2, Point(0, 35), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0));
 +        putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false);
++        putText(frame, label2, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false);
  
          // Print predicted class.
          label = format("%s: %.4f", (classes.empty() ? format("Class #%d", classId).c_str() :
                                                        classes[classId].c_str()),
                                     confidence);
--        putText(frame, label, Point(0, 40), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0));
-+        putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false);
+-        putText(frame, label, Point(0, 55), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0));
++        putText(frame, label, Point(0, 70), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false);
  
          imshow(kWinName, frame);
      }
@@ -68,7 +70,7 @@ Index: git/samples/dnn/object_detection.cpp
 ===================================================================
 --- git.orig/samples/dnn/object_detection.cpp
 +++ git/samples/dnn/object_detection.cpp
-@@ -251,13 +251,13 @@ int main(int argc, char** argv)
+@@ -260,13 +260,13 @@ int main(int argc, char** argv)
          if (predictionsQueue.counter > 1)
          {
              std::string label = format("Camera: %.2f FPS", framesQueue.getFPS());
@@ -85,7 +87,7 @@ Index: git/samples/dnn/object_detection.cpp
          }
          imshow(kWinName, frame);
      }
-@@ -293,7 +293,7 @@ int main(int argc, char** argv)
+@@ -302,7 +302,7 @@ int main(int argc, char** argv)
          double freq = getTickFrequency() / 1000;
          double t = net.getPerfProfile(layersTimes) / freq;
          std::string label = format("Inference time: %.2f ms", t);
@@ -94,7 +96,7 @@ Index: git/samples/dnn/object_detection.cpp
  
          imshow(kWinName, frame);
      }
-@@ -462,7 +462,7 @@ void drawPred(int classId, float conf, i
+@@ -471,7 +471,7 @@ void drawPred(int classId, float conf, i
      top = max(top, labelSize.height);
      rectangle(frame, Point(left, top - labelSize.height),
                Point(left + labelSize.width, top + baseLine), Scalar::all(255), FILLED);
@@ -107,7 +109,7 @@ Index: git/samples/dnn/segmentation.cpp
 ===================================================================
 --- git.orig/samples/dnn/segmentation.cpp
 +++ git/samples/dnn/segmentation.cpp
-@@ -157,7 +157,7 @@ int main(int argc, char** argv)
+@@ -162,7 +162,7 @@ int main(int argc, char** argv)
          double freq = getTickFrequency() / 1000;
          double t = net.getPerfProfile(layersTimes) / freq;
          std::string label = format("Inference time: %.2f ms", t);
diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb
index 331189ea..54beed06 100644
--- a/recipes-support/opencv/opencv_4.5.2.imx.bb
+++ b/recipes-support/opencv/opencv_4.6.0.imx.bb
@@ -3,6 +3,8 @@
 # recipe. The second section customizes the recipe for i.MX.
 
 ########## meta-openembedded copy ###########
+# Upstream hash: 6b7cf95e75cbfc08cf1f6eddc7ce3f6a0a39edcf
+#                plus LICENSE_FLAGS_ACCEPTED fix
 
 SUMMARY = "Opencv : The Open Computer Vision Library"
 HOMEPAGE = "http://opencv.org/"
@@ -16,8 +18,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
 
 DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
 
-SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03"
-SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd"
+SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b"
+SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868"
 SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -45,22 +47,20 @@ IPP_MD5 = "${@ipp_md5sum(d)}"
 
 SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
 SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \
-           git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \
-           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \
-           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \
+           git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \
+           git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \
+           git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \
            file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
            file://0003-To-fix-errors-as-following.patch \
            file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
            file://0001-Dont-use-isystem.patch \
            file://download.patch \
            file://0001-Make-ts-module-external.patch \
-           file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \
-           file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \
            "
-SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
+SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
 
 S = "${WORKDIR}/git"
 
@@ -69,7 +69,7 @@ S = "${WORKDIR}/git"
 OPENCV_DLDIR = "${WORKDIR}/downloads"
 
 do_unpack_extra() {
-    tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
+    tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S}
 
     md5() {
         # Return the MD5 of $1
@@ -84,22 +84,22 @@ do_unpack_extra() {
             test -e $DEST || ln -s $F $DEST
         done
     }
-    cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i
-    cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i
-    cache data ${WORKDIR}/face/*.dat
-    cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel
-    cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt
+    cache xfeatures2d/boostdesc ${S}/boostdesc/*.i
+    cache xfeatures2d/vgg ${S}/vgg/*.i
+    cache data ${S}/face/*.dat
+    cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel
+    cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt
 }
 addtask unpack_extra after do_unpack before do_patch
 
 CMAKE_VERBOSE = "VERBOSE=1"
 
-EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \
     -DWITH_1394=OFF \
     -DENABLE_PRECOMPILED_HEADERS=OFF \
     -DCMAKE_SKIP_RPATH=ON \
     -DOPENCV_ICV_HASH=${IPP_MD5} \
-    -DIPPROOT=${WORKDIR}/ippicv_lnx \
+    -DIPPROOT=${S}/ippicv_lnx \
     -DOPENCV_GENERATE_PKGCONFIG=ON \
     -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \
     -DOPENCV_ALLOW_DOWNLOADS=OFF \
@@ -107,7 +107,13 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
     ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \
 "
+LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
+LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
+
 EXTRA_OECMAKE:append:x86 = " -DX86=ON"
+# disable sse4.1 and sse4.2 to fix 32bit build failure
+# https://github.com/opencv/opencv/issues/21597
+EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1"
 
 PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
@@ -167,10 +173,10 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '
 
 python populate_packages:prepend () {
     cv_libdir = d.expand('${libdir}')
-    do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
-    do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
-    do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
-    do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
+    do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
+    do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+    do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+    do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
 
     pn = d.getVar('PN')
     metapkg =  pn + '-dev'
@@ -251,14 +257,14 @@ SUMMARY = "Opencv : The Open Computer Vision Library, i.MX Fork"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 # Replace the opencv URL with the fork
-SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998"
-OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https;branch=master"
-SRCBRANCH = "4.5.2_imx"
+SRCREV_opencv = "d3440df40a6e90cd1d2a1b729bcbc16aa4d42f5d"
+OPENCV_SRC ?= "git://github.com/nxp-imx/opencv-imx.git;protocol=https;branch=master"
+SRCBRANCH = "4.6.0_imx"
 SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https"
 SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv"
 
 # Add opencv_extra
-SRCREV_extra = "855c4528402e563283f86f28c6393f57eb5dcf62"
+SRCREV_extra = "936854e2b666853d6d0732a8eabc2d699f4fa3d8"
 SRC_URI += " \
     git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \
     file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \
@@ -281,7 +287,13 @@ PACKAGECONFIG:append        = " ${PACKAGECONFIG_OPENCL}"
 
 PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx,"
 PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native,"
+PACKAGECONFIG[qt6] = "-DWITH_QT=ON -DQT_HOST_PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native},-DWITH_QT=OFF,qtbase qtbase-native,"
 PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF,"
+PACKAGECONFIG[tim-vx] = "-DWITH_TIMVX=ON -DTIMVX_INSTALL_DIR=${STAGING_DIR_HOST}${libdir},-DWITH_TIMVX=OFF,tim-vx"
+
+# Disable cvv module in opencv_contrib as it is not yet suppported for Qt6
+# (opencv debug framework)
+EXTRA_OECMAKE:append = " -DBUILD_opencv_cvv=OFF"
 
 do_install:append() {
     ln -sf opencv4/opencv2 ${D}${includedir}/opencv2