summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/include/imx8x-mek.inc1
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc2
-rw-r--r--recipes-bsp/atf/qoriq-atf_2.4.bb2
-rw-r--r--recipes-bsp/ddr-phy/ddr-phy_git.bb2
-rw-r--r--recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb2
-rw-r--r--recipes-bsp/imx-kobs/imx-kobs_git.bb2
-rw-r--r--recipes-bsp/imx-uuc/imx-uuc_git.bb2
-rw-r--r--recipes-bsp/inphi/inphi_git.bb2
-rw-r--r--recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb2
-rw-r--r--recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb2
-rw-r--r--recipes-bsp/ls2-phy/ls2-phy_git.bb2
-rw-r--r--recipes-bsp/mxsldr/mxsldr_git.bb2
-rw-r--r--recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb2
-rw-r--r--recipes-bsp/qe-ucode/qe-ucode_git.bb2
-rw-r--r--recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc2
-rw-r--r--recipes-bsp/uefi/uefi_git.bb2
-rw-r--r--recipes-devtools/devregs/devregs_git.bb2
-rw-r--r--recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb2
-rw-r--r--recipes-devtools/utp-com/utp-com_git.bb2
-rw-r--r--recipes-devtools/uuu/uuu_git.bb2
-rw-r--r--recipes-dpaa/fm-ucode/fm-ucode_git.bb2
-rw-r--r--recipes-dpaa2/management-complex/management-complex_10.14.1.bb2
-rw-r--r--recipes-dpaa2/management-complex/management-complex_10.20.4.bb2
-rw-r--r--recipes-dpaa2/management-complex/management-complex_10.24.0.bb2
-rw-r--r--recipes-dpaa2/management-complex/management-complex_10.29.0.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb2
-rw-r--r--recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb2
-rw-r--r--recipes-kernel/linux/linux-fslc-qoriq_5.4.bb2
-rw-r--r--recipes-kernel/linux/linux-fslc.inc2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb2
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb2
-rw-r--r--recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb2
-rw-r--r--recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb2
-rw-r--r--recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch41
-rw-r--r--recipes-support/opencv/opencv_4.5.2.imx.bb33
39 files changed, 98 insertions, 49 deletions
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index e6f4f058..b4964c30 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -26,7 +26,6 @@ KERNEL_DEVICETREE = " \
26KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 26KERNEL_DEVICETREE:append:use-nxp-bsp = " \
27 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \ 27 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \
28 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \ 28 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \
29 freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \
30 freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \ 29 freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \
31 freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel.dtb \ 30 freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel.dtb \
32 freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel-rpmsg.dtb \ 31 freescale/${KERNEL_DEVICETREE_BASENAME}-it6263-lvds0-dual-channel-rpmsg.dtb \
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
index 7d8065f9..c719c8ae 100644
--- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc
@@ -14,7 +14,7 @@ CHROMIUM_IMX_COMMON_PATCHES ?= " "
14CHROMIUM_IMX_VPU_PATCHES ?= " " 14CHROMIUM_IMX_VPU_PATCHES ?= " "
15CHROMIUM_IMX_WAYLAND_PATCHES ?= " " 15CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
16 16
17SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV}" 17SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https"
18 18
19do_unpack[postfuncs] += "copy_chromium_imx_files" 19do_unpack[postfuncs] += "copy_chromium_imx_files"
20# using =+ instead of += to make sure add_chromium_imx_patches is 20# using =+ instead of += to make sure add_chromium_imx_patches is
diff --git a/recipes-bsp/atf/qoriq-atf_2.4.bb b/recipes-bsp/atf/qoriq-atf_2.4.bb
index 9c8937a2..0c490a72 100644
--- a/recipes-bsp/atf/qoriq-atf_2.4.bb
+++ b/recipes-bsp/atf/qoriq-atf_2.4.bb
@@ -7,7 +7,7 @@ DEPENDS:append:lx2160a += "ddr-phy"
7DEPENDS:append:lx2162a += "ddr-phy" 7DEPENDS:append:lx2162a += "ddr-phy"
8do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" 8do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy"
9 9
10SRC_URI += "git://github.com/ARMmbed/mbedtls;nobranch=1;destsuffix=git/mbedtls;name=mbedtls" 10SRC_URI += "git://github.com/ARMmbed/mbedtls;nobranch=1;destsuffix=git/mbedtls;name=mbedtls;protocol=https"
11SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708" 11SRCREV_mbedtls = "0795874acdf887290b2571b193cafd3c4041a708"
12SRCREV_FORMAT = "atf" 12SRCREV_FORMAT = "atf"
13 13
diff --git a/recipes-bsp/ddr-phy/ddr-phy_git.bb b/recipes-bsp/ddr-phy/ddr-phy_git.bb
index 6e68bd02..8ea92502 100644
--- a/recipes-bsp/ddr-phy/ddr-phy_git.bb
+++ b/recipes-bsp/ddr-phy/ddr-phy_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA.txt;md5=89cc852481956e861228286ac7430
4 4
5inherit deploy 5inherit deploy
6 6
7SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1" 7SRC_URI = "git://github.com/nxp/ddr-phy-binary.git;nobranch=1;protocol=https"
8SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba" 8SRCREV = "fbc036b88acb6c06ffed02c898cbae9856ec75ba"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
index 287b1cff..5a7e6a1d 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb
@@ -10,7 +10,7 @@ SECTION = "kernel"
10LICENSE = "Proprietary" 10LICENSE = "Proprietary"
11LIC_FILES_CHKSUM = "file://cyw-wifi-bt/EULA.txt;md5=80c0478f4339af024519b3723023fe28" 11LIC_FILES_CHKSUM = "file://cyw-wifi-bt/EULA.txt;md5=80c0478f4339af024519b3723023fe28"
12 12
13SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https" 13SRC_URI = "git://github.com/NXP/imx-firmware.git;protocol=https;branch=master"
14SRCREV = "484d38224fa2c26b8859a7bf20b7c4d49100f5bc" 14SRCREV = "484d38224fa2c26b8859a7bf20b7c4d49100f5bc"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-kobs/imx-kobs_git.bb b/recipes-bsp/imx-kobs/imx-kobs_git.bb
index d93a3f25..58bd44f8 100644
--- a/recipes-bsp/imx-kobs/imx-kobs_git.bb
+++ b/recipes-bsp/imx-kobs/imx-kobs_git.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 8LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
9 9
10PV = "5.5+git${SRCPV}" 10PV = "5.5+git${SRCPV}"
11SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https \ 11SRC_URI = "git://github.com/NXPmicro/imx-kobs.git;protocol=https;branch=master \
12" 12"
13SRCREV = "269fdffcf97238684de9f28977a73677282e061f" 13SRCREV = "269fdffcf97238684de9f28977a73677282e061f"
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
diff --git a/recipes-bsp/imx-uuc/imx-uuc_git.bb b/recipes-bsp/imx-uuc/imx-uuc_git.bb
index 02331a80..0de2ad85 100644
--- a/recipes-bsp/imx-uuc/imx-uuc_git.bb
+++ b/recipes-bsp/imx-uuc/imx-uuc_git.bb
@@ -11,7 +11,7 @@ inherit autotools-brokensep
11PR = "r1" 11PR = "r1"
12PV = "0.5.1+git${SRCPV}" 12PV = "0.5.1+git${SRCPV}"
13 13
14SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https" 14SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master"
15SRCREV = "d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc" 15SRCREV = "d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
diff --git a/recipes-bsp/inphi/inphi_git.bb b/recipes-bsp/inphi/inphi_git.bb
index 314f09d4..4deacb58 100644
--- a/recipes-bsp/inphi/inphi_git.bb
+++ b/recipes-bsp/inphi/inphi_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798"
4 4
5inherit deploy 5inherit deploy
6 6
7SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1" 7SRC_URI = "git://github.com/nxp/qoriq-firmware-inphi.git;nobranch=1;protocol=https"
8SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695" 8SRCREV = "f22e9ff3bfed8342da6efb699e473b11fbad5695"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
diff --git a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb
index 363f7305..07d52355 100644
--- a/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb
+++ b/recipes-bsp/isp-imx/libtinyxml2-8_8.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
4LICENSE = "Zlib" 4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" 5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd"
6 6
7SRC_URI = "git://github.com/leethomason/tinyxml2.git" 7SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https"
8 8
9SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" 9SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb"
10 10
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb
index e57a4273..38481b54 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb
@@ -9,7 +9,7 @@ PV .= "+git${SRCPV}"
9 9
10SRCBRANCH ?= "master" 10SRCBRANCH ?= "master"
11SRCREV = "d2058aa404ee1e8e8abd552c6a637787bcdcf514" 11SRCREV = "d2058aa404ee1e8e8abd552c6a637787bcdcf514"
12SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH} \ 12SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \
13 file://run-ptest \ 13 file://run-ptest \
14 " 14 "
15 15
diff --git a/recipes-bsp/ls2-phy/ls2-phy_git.bb b/recipes-bsp/ls2-phy/ls2-phy_git.bb
index dd5f8fc0..c13a05a1 100644
--- a/recipes-bsp/ls2-phy/ls2-phy_git.bb
+++ b/recipes-bsp/ls2-phy/ls2-phy_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://EULA.txt;md5=86d76166990962fa552f840ff08e5798"
4 4
5inherit deploy 5inherit deploy
6 6
7SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1" 7SRC_URI = "git://github.com/nxp/qoriq-firmware-cortina.git;nobranch=1;protocol=https"
8SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf" 8SRCREV = "9143c2a3adede595966583c00ca4edc99ec698cf"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
diff --git a/recipes-bsp/mxsldr/mxsldr_git.bb b/recipes-bsp/mxsldr/mxsldr_git.bb
index 01e24993..62b4b7ad 100644
--- a/recipes-bsp/mxsldr/mxsldr_git.bb
+++ b/recipes-bsp/mxsldr/mxsldr_git.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8 8
9SRCREV = "c40d80472525e1d57dae5317c028b745968c0399" 9SRCREV = "c40d80472525e1d57dae5317c028b745968c0399"
10SRC_URI = "git://git.denx.de/mxsldr.git \ 10SRC_URI = "git://git.denx.de/mxsldr.git;branch=master \
11 file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \ 11 file://0001-Do-not-ignore-OE-cflags-and-ldflags.patch \
12 " 12 "
13 13
diff --git a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
index 5c97486e..c01bfd4c 100644
--- a/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
+++ b/recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb
@@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1"
7 7
8inherit deploy 8inherit deploy
9 9
10SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1" 10SRC_URI = "git://github.com/NXP/qoriq-engine-pfe-bin.git;nobranch=1;protocol=https"
11SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234" 11SRCREV = "f55ee9f72090309bbb7ab71f48a498fc02909234"
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
diff --git a/recipes-bsp/qe-ucode/qe-ucode_git.bb b/recipes-bsp/qe-ucode/qe-ucode_git.bb
index 19cb79e0..33648d1e 100644
--- a/recipes-bsp/qe-ucode/qe-ucode_git.bb
+++ b/recipes-bsp/qe-ucode/qe-ucode_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=c62f8109b4df15ca37ceeb5e4943626c"
5 5
6inherit deploy 6inherit deploy
7 7
8SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1" 8SRC_URI = "git://github.com/NXP/qoriq-qe-ucode.git;nobranch=1;protocol=https"
9SRCREV= "57401f6dff6507055558eaa6838116baa8a2fd46" 9SRCREV= "57401f6dff6507055558eaa6838116baa8a2fd46"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc b/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc
index 3c56a8f2..7d401692 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc
+++ b/recipes-bsp/u-boot/u-boot-fslc-common_2021.07.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
8 8
9DEPENDS += "flex-native bison-native" 9DEPENDS += "flex-native bison-native"
10 10
11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}" 11SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH};protocol=https"
12 12
13SRCREV = "691e634bfd317ede487d2b864a126847ffeb4aa7" 13SRCREV = "691e634bfd317ede487d2b864a126847ffeb4aa7"
14SRCBRANCH = "2021.07+fslc" 14SRCBRANCH = "2021.07+fslc"
diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb
index 6174e258..d7ef0b72 100644
--- a/recipes-bsp/uefi/uefi_git.bb
+++ b/recipes-bsp/uefi/uefi_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315"
5 5
6inherit deploy 6inherit deploy
7 7
8SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1" 8SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https"
9SRCREV= "1b28cad962a3f7b61baae2229cb3b84926941cfa" 9SRCREV= "1b28cad962a3f7b61baae2229cb3b84926941cfa"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb
index 7f158fd8..59328ab3 100644
--- a/recipes-devtools/devregs/devregs_git.bb
+++ b/recipes-devtools/devregs/devregs_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL-1"
4LIC_FILES_CHKSUM = "file://COPYING;md5=5003fa041d799dd5dd5f646b74e36924" 4LIC_FILES_CHKSUM = "file://COPYING;md5=5003fa041d799dd5dd5f646b74e36924"
5 5
6SRCREV = "d5f6223027f4d6ae71bd5d432f5611486e0e6074" 6SRCREV = "d5f6223027f4d6ae71bd5d432f5611486e0e6074"
7SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=http" 7SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=master"
8 8
9PV = "1.0+${SRCPV}" 9PV = "1.0+${SRCPV}"
10 10
diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
index c5f51983..1a1e1a9c 100644
--- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
+++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
6DEPENDS = "libusb1" 6DEPENDS = "libusb1"
7 7
8SRCREV = "f009770d841468204ab104bf7d3b0c5bc8425dbb" 8SRCREV = "f009770d841468204ab104bf7d3b0c5bc8425dbb"
9SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=http" 9SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;branch=master"
10 10
11PV = "1.0+${SRCPV}" 11PV = "1.0+${SRCPV}"
12 12
diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/recipes-devtools/utp-com/utp-com_git.bb
index db2d7f08..0b0a6cf2 100644
--- a/recipes-devtools/utp-com/utp-com_git.bb
+++ b/recipes-devtools/utp-com/utp-com_git.bb
@@ -6,7 +6,7 @@ DEPENDS = "sg3-utils"
6 6
7SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6" 7SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6"
8SRC_URI = " \ 8SRC_URI = " \
9 git://github.com/Freescale/utp_com;protocol=https \ 9 git://github.com/Freescale/utp_com;protocol=https;branch=master \
10" 10"
11 11
12PV = "1.0+git${SRCPV}" 12PV = "1.0+git${SRCPV}"
diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb
index 1726e990..dedcbe84 100644
--- a/recipes-devtools/uuu/uuu_git.bb
+++ b/recipes-devtools/uuu/uuu_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Universal Update Utility"
2DESCRIPTION = "Image deploy tool for i.MX chips" 2DESCRIPTION = "Image deploy tool for i.MX chips"
3HOMEPAGE = "https://github.com/NXPmicro/mfgtools" 3HOMEPAGE = "https://github.com/NXPmicro/mfgtools"
4 4
5SRC_URI = "git://github.com/NXPmicro/mfgtools.git;protocol=https" 5SRC_URI = "git://github.com/NXPmicro/mfgtools.git;protocol=https;branch=master"
6SRCREV = "e10b0260076e0119c259f7f44447904f14109ba2" 6SRCREV = "e10b0260076e0119c259f7f44447904f14109ba2"
7PV = "1.4.165" 7PV = "1.4.165"
8 8
diff --git a/recipes-dpaa/fm-ucode/fm-ucode_git.bb b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
index 966ee94c..f79122c6 100644
--- a/recipes-dpaa/fm-ucode/fm-ucode_git.bb
+++ b/recipes-dpaa/fm-ucode/fm-ucode_git.bb
@@ -7,7 +7,7 @@ PR = "r1"
7 7
8inherit deploy 8inherit deploy
9 9
10SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1" 10SRC_URI = "git://github.com/NXP/qoriq-fm-ucode.git;nobranch=1;protocol=https"
11SRCREV = "c275e91392e2adab1ed22f3867b8269ca3c54014" 11SRCREV = "c275e91392e2adab1ed22f3867b8269ca3c54014"
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
index a3793bd4..4d4f1dcd 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
@@ -6,7 +6,7 @@ inherit deploy
6 6
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
8 8
9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" 9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
10SRCREV = "408110ee632f6291545b0b156cd74e7e3b4612cc" 10SRCREV = "408110ee632f6291545b0b156cd74e7e3b4612cc"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
index 8352a098..07f26b29 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
@@ -6,7 +6,7 @@ inherit deploy
6 6
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
8 8
9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" 9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
10SRCREV = "f73683596a7b72124d67b62e64f3dc2bb36b9321" 10SRCREV = "f73683596a7b72124d67b62e64f3dc2bb36b9321"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.24.0.bb b/recipes-dpaa2/management-complex/management-complex_10.24.0.bb
index 1e100f20..3408fba0 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.24.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.24.0.bb
@@ -6,7 +6,7 @@ inherit deploy
6 6
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
8 8
9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" 9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
10SRCREV = "324817697a4c89a9a940fb7dba1b18909913ee20" 10SRCREV = "324817697a4c89a9a940fb7dba1b18909913ee20"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
diff --git a/recipes-dpaa2/management-complex/management-complex_10.29.0.bb b/recipes-dpaa2/management-complex/management-complex_10.29.0.bb
index ba43b761..08991f09 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.29.0.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.29.0.bb
@@ -6,7 +6,7 @@ inherit deploy
6 6
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
8 8
9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1" 9SRC_URI = "git://github.com/nxp/qoriq-mc-binary;nobranch=1;protocol=https"
10SRCREV = "d21bc22000a14b0b6eeafc017fb93bc70499f74a" 10SRCREV = "d21bc22000a14b0b6eeafc017fb93bc70499f74a"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb
index af0b2d60..3e3f8aff 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.0.p2.4+fslc.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
10PV .= "+git${SRCPV}" 10PV .= "+git${SRCPV}"
11 11
12SRCREV = "f2e8483fbda59bf2482f77efb0804c014848f749" 12SRCREV = "f2e8483fbda59bf2482f77efb0804c014848f749"
13SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https" 13SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb
index 343cce41..996e8262 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p2.2.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
9 9
10SRCBRANCH = "lf-5.10.y" 10SRCBRANCH = "lf-5.10.y"
11LOCALVERSION = "-5.10.52-2.1.0" 11LOCALVERSION = "-5.10.52-2.1.0"
12KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https" 12KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=master"
13SRC_URI = " \ 13SRC_URI = " \
14 ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ 14 ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
15 file://Add-makefile.patch \ 15 file://Add-makefile.patch \
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb
index f003da18..df97f8b9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.15.0.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" 5LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
6 6
7SRCBRANCH = "lf-5.10.52_2.1.0" 7SRCBRANCH = "lf-5.10.52_2.1.0"
8ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https" 8ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https;branch=master"
9 9
10SRC_URI = " \ 10SRC_URI = " \
11 ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ 11 ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \
diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb
index db972ba7..212e7858 100644
--- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb
@@ -14,4 +14,4 @@ LINUX_VERSION = "5.4.92"
14 14
15SRCBRANCH = "5.4.y+qoriq+fslc" 15SRCBRANCH = "5.4.y+qoriq+fslc"
16SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3" 16SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3"
17SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH}" 17SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH};protocol=https"
diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc
index 566dd194..7e7ae446 100644
--- a/recipes-kernel/linux/linux-fslc.inc
+++ b/recipes-kernel/linux/linux-fslc.inc
@@ -5,6 +5,6 @@ require recipes-kernel/linux/linux-imx.inc
5 5
6DEPENDS += "lzop-native bc-native" 6DEPENDS += "lzop-native bc-native"
7 7
8SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH} \ 8SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https \
9 file://defconfig" 9 file://defconfig"
10LOCALVERSION = "-fslc" 10LOCALVERSION = "-fslc"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb
index c3e64172..aec2bb01 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.0.imx.bb
@@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1"
10PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}" 10PACKAGE_ARCH:imxpxp = "${MACHINE_SOCARCH}"
11PACKAGE_ARCH:mx8 = "${MACHINE_SOCARCH}" 11PACKAGE_ARCH:mx8 = "${MACHINE_SOCARCH}"
12 12
13GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" 13GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https;branch=master"
14SRCBRANCH = "MM_04.06.01_2105_L5.10.y" 14SRCBRANCH = "MM_04.06.01_2105_L5.10.y"
15 15
16SRC_URI = " \ 16SRC_URI = " \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb
index 142e0ba5..5dd672bf 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.imx.bb
@@ -6,7 +6,7 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues
6LICENSE = "GPLv2+ & LGPLv2+" 6LICENSE = "GPLv2+ & LGPLv2+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" 7LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
8 8
9GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" 9GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https;branch=master"
10SRCBRANCH = "MM_04.06.01_2105_L5.10.y" 10SRCBRANCH = "MM_04.06.01_2105_L5.10.y"
11SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ 11SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
12 file://0003-viv-fb-Make-sure-config.h-is-included.patch \ 12 file://0003-viv-fb-Make-sure-config.h-is-included.patch \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb
index 706fdb61..050bc6ee 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.imx.bb
@@ -1,6 +1,6 @@
1require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc 1require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
2 2
3GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" 3GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https;branch=master"
4SRCBRANCH = "MM_04.06.01_2105_L5.10.y" 4SRCBRANCH = "MM_04.06.01_2105_L5.10.y"
5 5
6SRC_URI = " \ 6SRC_URI = " \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb
index 26f25d72..41de1369 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.0.0.bb
@@ -16,7 +16,7 @@ PV .= "+git${SRCPV}"
16 16
17SRCBRANCH ?= "master" 17SRCBRANCH ?= "master"
18SRCREV = "11e3a555a280f97d55d5243e8259a255b3ed14d0" 18SRCREV = "11e3a555a280f97d55d5243e8259a255b3ed14d0"
19SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH}" 19SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb
index 13d1682a..c474f9b0 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18# Use i.MX fork of GST for customizations 18# Use i.MX fork of GST for customizations
19GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" 19GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https;branch=master"
20SRCBRANCH = "MM_04.06.01_2105_L5.10.y" 20SRCBRANCH = "MM_04.06.01_2105_L5.10.y"
21SRC_URI = "${GST1.0_SRC};branch=${SRCBRANCH} \ 21SRC_URI = "${GST1.0_SRC};branch=${SRCBRANCH} \
22 file://run-ptest \ 22 file://run-ptest \
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb
index 372d78dc..2b995b60 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb
@@ -9,7 +9,7 @@ PV .= "+git${SRCPV}"
9 9
10SRCBRANCH ?= "master" 10SRCBRANCH ?= "master"
11SRCREV = "a650f13fb5de94e0c7c9e77f4d07ea275ea80dac" 11SRCREV = "a650f13fb5de94e0c7c9e77f4d07ea275ea80dac"
12SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH}" 12SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
index 2d0f8571..778514fb 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi_git.bb
@@ -10,7 +10,7 @@ PV = "0.10.3+${SRCPV}"
10 10
11SRCBRANCH ?= "v1" 11SRCBRANCH ?= "v1"
12SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e" 12SRCREV = "3a1ee3a54fe93813868d38c3d32ea065b59e227e"
13SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH}" 13SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
diff --git a/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch b/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
new file mode 100644
index 00000000..5d88d1a6
--- /dev/null
+++ b/recipes-support/opencv/opencv/0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch
@@ -0,0 +1,41 @@
1From 9cfa84313c5833d7295fcf57be93d5d2aaadfd88 Mon Sep 17 00:00:00 2001
2From: Vincent Rabaud <vrabaud@google.com>
3Date: Sat, 10 Jul 2021 00:21:52 +0200
4Subject: [PATCH] Use the one argument version of SetTotalBytesLimit.
5
6The two argument versions has been deprecated, cf
7https://developers.google.com/protocol-buffers/docs/reference/cpp/google.protobuf.io.coded_stream
8
9Upstream-Status: Backport [9cfa84313c5833d7295fcf57be93d5d2aaadfd88 - from master after 4.5.3 tag]
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 modules/dnn/src/caffe/caffe_io.cpp | 5 +++++
13 1 file changed, 5 insertions(+)
14
15diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
16index 2fc4d84f46..ebecf95eea 100644
17--- a/modules/dnn/src/caffe/caffe_io.cpp
18+++ b/modules/dnn/src/caffe/caffe_io.cpp
19@@ -92,6 +92,7 @@
20 #ifdef HAVE_PROTOBUF
21 #include <google/protobuf/io/coded_stream.h>
22 #include <google/protobuf/io/zero_copy_stream_impl.h>
23+#include <google/protobuf/stubs/common.h>
24 #include <google/protobuf/text_format.h>
25
26 #include <opencv2/core.hpp>
27@@ -1111,7 +1112,11 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by
28
29 bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) {
30 CodedInputStream coded_input(input);
31+#if GOOGLE_PROTOBUF_VERSION >= 3006000
32+ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit);
33+#else
34 coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
35+#endif
36
37 return proto->ParseFromCodedStream(&coded_input);
38 }
39--
402.32.0
41
diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb
index 8e76783a..f84e29d7 100644
--- a/recipes-support/opencv/opencv_4.5.2.imx.bb
+++ b/recipes-support/opencv/opencv_4.5.2.imx.bb
@@ -44,13 +44,13 @@ IPP_FILENAME = "${@ipp_filename(d)}"
44IPP_MD5 = "${@ipp_md5sum(d)}" 44IPP_MD5 = "${@ipp_md5sum(d)}"
45 45
46SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" 46SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg"
47SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ 47SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \
48 git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ 48 git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \
49 git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ 49 git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \
50 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ 50 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \
51 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ 51 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \
52 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ 52 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \
53 git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode \ 53 git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \
54 file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ 54 file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
55 file://0003-To-fix-errors-as-following.patch \ 55 file://0003-To-fix-errors-as-following.patch \
56 file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ 56 file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
@@ -58,6 +58,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
58 file://download.patch \ 58 file://download.patch \
59 file://0001-Make-ts-module-external.patch \ 59 file://0001-Make-ts-module-external.patch \
60 file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ 60 file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \
61 file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \
61 " 62 "
62SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" 63SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib"
63 64
@@ -112,6 +113,12 @@ PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples
112 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ 113 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
113 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" 114 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
114 115
116# TBB does not build for powerpc so disable that package config
117PACKAGECONFIG:remove:powerpc = "tbb"
118# tbb now needs getcontect/setcontext which is not there for all arches on musl
119PACKAGECONFIG:remove:libc-musl:riscv64 = "tbb"
120PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb"
121
115PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" 122PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
116PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," 123PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
117PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," 124PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
@@ -229,10 +236,12 @@ do_install:append() {
229 sed -e 's@${STAGING_DIR_HOST}@@g' \ 236 sed -e 's@${STAGING_DIR_HOST}@@g' \
230 -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake 237 -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake
231 fi 238 fi
239 # remove setup_vars_opencv4.sh as its content is confusing and useless
240 if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then
241 rm -rf ${D}${bindir}/setup_vars_opencv4.sh
242 fi
232} 243}
233 244
234TOOLCHAIN = "gcc"
235
236########## End of meta-openembedded copy ########## 245########## End of meta-openembedded copy ##########
237 246
238########## i.MX overrides ########## 247########## i.MX overrides ##########
@@ -243,15 +252,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
243 252
244# Replace the opencv URL with the fork 253# Replace the opencv URL with the fork
245SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998" 254SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998"
246OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https" 255OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https;branch=master"
247SRCBRANCH = "4.5.2_imx" 256SRCBRANCH = "4.5.2_imx"
248SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv" 257SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https"
249SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv" 258SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv"
250 259
251# Add opencv_extra 260# Add opencv_extra
252SRCREV_extra = "855c4528402e563283f86f28c6393f57eb5dcf62" 261SRCREV_extra = "855c4528402e563283f86f28c6393f57eb5dcf62"
253SRC_URI += " \ 262SRC_URI += " \
254 git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra \ 263 git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \
255 file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ 264 file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \
256" 265"
257SRCREV_FORMAT:append = "_extra" 266SRCREV_FORMAT:append = "_extra"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-14 16:01:28 +0000