diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-11-25 16:46:24 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-25 16:46:24 -0300 |
commit | 2375425cd54f9ac293ccd60ed9350f9b4c6db20e (patch) | |
tree | 5b916f4ec1d6355299d992fdec880afea6ef6b18 | |
parent | f1da32b14f595446242422cea762aa9a81261917 (diff) | |
parent | 5554647fa199375fb8e1aef657d5ff74ac115022 (diff) | |
download | meta-freescale-2375425cd54f9ac293ccd60ed9350f9b4c6db20e.tar.gz |
Merge pull request #1310 from MaxKrummenacher/master
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" | |||
495 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.17.0.imx" | 495 | PREFERRED_VERSION_optee-test:mx8-nxp-bsp ??= "3.17.0.imx" |
496 | 496 | ||
497 | #Use i.MX opencv Version for mx8 | 497 | #Use i.MX opencv Version for mx8 |
498 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.5.2.imx" | 498 | PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx" |
499 | 499 | ||
500 | # Handle default kernel | 500 | # Handle default kernel |
501 | IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc" | 501 | 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 @@ | |||
1 | # Copyright (C) 2019-2021 NXP | 1 | # Copyright 2019-2022 NXP |
2 | 2 | ||
3 | DESCRIPTION = "i.MX VC8000E Encoder library" | 3 | DESCRIPTION = "i.MX VC8000E Encoder library" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
6 | 6 | ||
7 | inherit fsl-eula-unpack | 7 | inherit fsl-eula-unpack |
8 | 8 | ||
@@ -10,8 +10,8 @@ SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | |||
10 | 10 | ||
11 | S = "${WORKDIR}/${BPN}-${PV}" | 11 | S = "${WORKDIR}/${BPN}-${PV}" |
12 | 12 | ||
13 | SRC_URI[md5sum] = "228b06302ad0f0da13a160573c06bbf4" | 13 | SRC_URI[md5sum] = "192b354d1c21836dc7338606e60b45ae" |
14 | SRC_URI[sha256sum] = "537fdbc20fbd1fb561b9a0d01ad843ea25c46e5a5cd184960fc9f1074674ddce" | 14 | SRC_URI[sha256sum] = "62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa" |
15 | 15 | ||
16 | # SCR is the location and name of the Software Content Register file | 16 | # SCR is the location and name of the Software Content Register file |
17 | # relative to ${D}${D_SUBDIR}. | 17 | # 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" | |||
7 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" | 7 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.tar.gz" |
10 | SRC_URI[md5sum] = "657af53a73fa9898ef7725dd26934079" | 10 | SRC_URI[md5sum] = "e4bdaa1e064e3959576f7dd5a2d89389" |
11 | SRC_URI[sha256sum] = "75f857ddfc53341c425d6dac0e6eb9b5c0281b90b6f6de3ff1b64962d52399c5" | 11 | SRC_URI[sha256sum] = "83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8" |
12 | 12 | ||
13 | PLATFORM:mx8mm-nxp-bsp = "IMX8MM" | 13 | PLATFORM:mx8mm-nxp-bsp = "IMX8MM" |
14 | PLATFORM:mx8mq-nxp-bsp = "IMX8MQ" | 14 | 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 @@ | |||
1 | From aba22ec2e285cf7557a5049fa6181e82e7f1a489 Mon Sep 17 00:00:00 2001 | ||
2 | From: Max Krummenacher <max.krummenacher@toradex.com> | ||
3 | Date: Mon, 21 Nov 2022 12:04:09 +0000 | ||
4 | Subject: [PATCH] buildsystem: don't ignore externally set cflags | ||
5 | |||
6 | Upstream-Status: pending | ||
7 | Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> | ||
8 | --- | ||
9 | decoder_sw/software/linux/h264high/Makefile | 4 ++-- | ||
10 | decoder_sw/software/linux/vp6/Makefile | 4 ++-- | ||
11 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/decoder_sw/software/linux/h264high/Makefile b/decoder_sw/software/linux/h264high/Makefile | ||
14 | index 556ff71..7bdd99d 100755 | ||
15 | --- a/decoder_sw/software/linux/h264high/Makefile | ||
16 | +++ b/decoder_sw/software/linux/h264high/Makefile | ||
17 | @@ -50,10 +50,10 @@ CLEAR_HDRINFO_IN_SEEK = n | ||
18 | DEBUG = y | ||
19 | # Add your debugging flag (or not) to CFLAGS | ||
20 | ifeq ($(DEBUG),y) | ||
21 | - CFLAGS = $(M32) -g -O0 | ||
22 | + CFLAGS += $(M32) -g -O0 | ||
23 | DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_RANGE_CHECK -D_ERROR_PRINT | ||
24 | else | ||
25 | - CFLAGS = $(M32) -O3 | ||
26 | + CFLAGS += $(M32) -O3 | ||
27 | DEBFLAGS = -DNDEBUG | ||
28 | endif | ||
29 | |||
30 | diff --git a/decoder_sw/software/linux/vp6/Makefile b/decoder_sw/software/linux/vp6/Makefile | ||
31 | index b6e6914..b933d46 100755 | ||
32 | --- a/decoder_sw/software/linux/vp6/Makefile | ||
33 | +++ b/decoder_sw/software/linux/vp6/Makefile | ||
34 | @@ -50,10 +50,10 @@ DEBUG = y | ||
35 | |||
36 | # Add your debugging flag (or not) to CFLAGS | ||
37 | ifeq ($(DEBUG),y) | ||
38 | - CFLAGS = -g -O0 | ||
39 | + CFLAGS += -g -O0 | ||
40 | DEBFLAGS = -DDEBUG -D_ASSERT_USED -D_ERROR_PRINT | ||
41 | else | ||
42 | - CFLAGS = -O3 | ||
43 | + CFLAGS += -O3 | ||
44 | DEBFLAGS = -DNDEBUG | ||
45 | endif | ||
46 | |||
47 | -- | ||
48 | 2.35.3 | ||
49 | |||
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 @@ | |||
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=d3c315c6eaa43e07d8c130dc3a04a011" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
6 | 6 | ||
7 | PROVIDES = "virtual/imxvpu" | 7 | PROVIDES = "virtual/imxvpu" |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 9 | SRC_URI = " \ |
10 | SRC_URI[md5sum] = "8d06cdacd7700e9e4c32644bf9804cdd" | 10 | ${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ |
11 | SRC_URI[sha256sum] = "0cf9193923e110d2d9e6576e2c632f1675f0751b4c3de9ef54f32813f442540a" | 11 | file://0001-buildsystem-don-t-ignore-externally-set-cflags.patch \ |
12 | " | ||
13 | SRC_URI[md5sum] = "cfa0e92da0eca9cf622c4d7abc618cef" | ||
14 | SRC_URI[sha256sum] = "7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3" | ||
12 | 15 | ||
13 | inherit fsl-eula-unpack use-imx-headers | 16 | inherit fsl-eula-unpack use-imx-headers |
14 | 17 | ||
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 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "Basler camera binary drivers" | 3 | DESCRIPTION = "Basler camera binary drivers" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
6 | 6 | ||
7 | inherit fsl-eula-unpack | 7 | inherit fsl-eula-unpack |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "4bc72b07f608cbe13d318a63adb8f9dc" | 11 | SRC_URI[md5sum] = "99962b0cbba53ef773b7ac8cb50ce05a" |
12 | SRC_URI[sha256sum] = "62393bcc11b6e8bb9918a29240fb57057870ec0cefff00042ee65d8a1fde081a" | 12 | SRC_URI[sha256sum] = "fd2f71c854134683ac293393255d61b985e75d8dae2e090c99c21dff756017fb" |
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | dest_dir=${D}/opt/imx8-isp/bin | 15 | 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 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX Verisilicon Software ISP" | 3 | DESCRIPTION = "i.MX Verisilicon Software ISP" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
6 | DEPENDS = "libdrm virtual/libg2d libtinyxml2" | 6 | DEPENDS = "libdrm virtual/libg2d libtinyxml2" |
7 | 7 | ||
8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 8 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
9 | SRC_URI[md5sum] = "a20171db4bf2be423a587f3b610f0a69" | 9 | SRC_URI[md5sum] = "d0350ad40df96a84efc4802975f92c91" |
10 | SRC_URI[sha256sum] = "468ae51223d1873a1a756a1e64a53c0c61ebd640b3810f3a9e912b6a0de6c3c8" | 10 | SRC_URI[sha256sum] = "5544aef41546906bc4999de1980e4706cf241c93732633efde57b018ac4863c3" |
11 | 11 | ||
12 | inherit fsl-eula-unpack cmake systemd use-imx-headers | 12 | inherit fsl-eula-unpack cmake systemd use-imx-headers |
13 | 13 | ||
@@ -25,6 +25,7 @@ SYSTEMD_SERVICE:${PN} = "imx8-isp.service" | |||
25 | EXTRA_OECMAKE += " \ | 25 | EXTRA_OECMAKE += " \ |
26 | -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ | 26 | -DSDKTARGETSYSROOT=${STAGING_DIR_HOST} \ |
27 | -DCMAKE_BUILD_TYPE=release \ | 27 | -DCMAKE_BUILD_TYPE=release \ |
28 | -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ | ||
28 | -DISP_VERSION=ISP8000NANO_V1802 \ | 29 | -DISP_VERSION=ISP8000NANO_V1802 \ |
29 | -DPLATFORM=ARM64 \ | 30 | -DPLATFORM=ARM64 \ |
30 | -DAPPMODE=V4L2 \ | 31 | -DAPPMODE=V4L2 \ |
@@ -45,11 +46,13 @@ do_install() { | |||
45 | install -d ${D}/${libdir} | 46 | install -d ${D}/${libdir} |
46 | install -d ${D}/${includedir} | 47 | install -d ${D}/${includedir} |
47 | install -d ${D}/opt/imx8-isp/bin | 48 | install -d ${D}/opt/imx8-isp/bin |
49 | install -d ${D}/opt/imx8-isp/bin/dewarp_config | ||
48 | 50 | ||
49 | cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin | 51 | cp -r ${B}/generated/release/bin/*_test ${D}/opt/imx8-isp/bin |
50 | cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin | 52 | cp -r ${B}/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin |
51 | cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin | 53 | cp -r ${B}/generated/release/bin/*.xml ${D}/opt/imx8-isp/bin |
52 | cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin | 54 | cp -r ${B}/generated/release/bin/*.drv ${D}/opt/imx8-isp/bin |
55 | cp -r ${WORKDIR}/${BP}/dewarp/dewarp_config/ ${D}/opt/imx8-isp/bin | ||
53 | cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin | 56 | cp -r ${B}/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin |
54 | cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin | 57 | cp -r ${B}/generated/release/bin/vvext ${D}/opt/imx8-isp/bin |
55 | cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} | 58 | cp -r ${B}/generated/release/lib/*.so* ${D}/${libdir} |
@@ -81,8 +84,6 @@ FILES_SOLIBS_VERSIONED = " \ | |||
81 | FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" | 84 | FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}" |
82 | FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" | 85 | FILES:${PN}-dev += "${FILES_SOLIBS_VERSIONED}" |
83 | 86 | ||
84 | INSANE_SKIP:${PN} = "rpaths" | ||
85 | |||
86 | RDEPENDS:${PN} = "libdrm" | 87 | RDEPENDS:${PN} = "libdrm" |
87 | 88 | ||
88 | COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)" | 89 | 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 @@ | |||
1 | # Copyright 2020-2021 NXP | ||
2 | |||
3 | DESCRIPTION = "Kernel loadable module for ISP" | ||
4 | LICENSE = "GPL-2.0-only" | ||
5 | LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" | ||
6 | |||
7 | SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" | ||
8 | ISP_KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/isp-vvcam.git;protocol=https" | ||
9 | SRCBRANCH = "lf-5.15.y_2.0.0" | ||
10 | SRCREV = "551415470092d6af1d7e11e7a78591f5800333f9" | ||
11 | |||
12 | S = "${WORKDIR}/git/vvcam/v4l2" | ||
13 | |||
14 | inherit module | ||
15 | |||
16 | 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 @@ | |||
1 | # Copyright 2020-2021 NXP | ||
2 | |||
3 | DESCRIPTION = "Kernel loadable module for ISP" | ||
4 | LICENSE = "GPL-2.0-only" | ||
5 | LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" | ||
6 | |||
7 | SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}" | ||
8 | ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" | ||
9 | SRCBRANCH = "lf-5.15.y_2.1.0" | ||
10 | SRCREV = "b26ee8a5402afd7488716e06d82147669c05eb4a" | ||
11 | |||
12 | S = "${WORKDIR}/git/vvcam/v4l2" | ||
13 | DEBUG_PREFIX_MAP = "-fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ | ||
14 | -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ | ||
15 | -fmacro-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ | ||
16 | -fdebug-prefix-map=${B}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ | ||
17 | -fdebug-prefix-map=${STAGING_DIR_HOST}= \ | ||
18 | -fmacro-prefix-map=${STAGING_DIR_HOST}= \ | ||
19 | -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ | ||
20 | " | ||
21 | |||
22 | inherit module | ||
23 | |||
24 | 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" | |||
2 | LICENSE = "GPL-2.0-only" | 2 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77" | 3 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=ab04ac0f249af12befccb94447c08b77" |
4 | 4 | ||
5 | SRCBRANCH = "lf-5.10.72_2.2.0" | 5 | SRCBRANCH = "lf-5.15.52_2.1.0" |
6 | MRVL_SRC ?= "git://source.codeaurora.org/external/imx/mwifiex.git;protocol=https" | 6 | MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https" |
7 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" | 7 | SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}" |
8 | SRCREV = "3c2a3c2cd25e9dce95f34c21bb4e728647eb64ee" | 8 | SRCREV = "5cda905576fd26eca6b49d0f0fb5e2bb3c0bf441" |
9 | 9 | ||
10 | S = "${WORKDIR}/git/mxm_wifiex/wlan_src" | 10 | S = "${WORKDIR}/git/mxm_wifiex/wlan_src" |
11 | 11 | ||
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 @@ | |||
1 | # Copyright (C) 2013-2016 Freescale Semiconductor | 1 | # Copyright 2013-2016 Freescale Semiconductor |
2 | # Copyright (C) 2017-2019 NXP | 2 | # Copyright 2017-2022 NXP |
3 | # Released under the MIT license (see COPYING.MIT for the terms) | 3 | # Released under the MIT license (see COPYING.MIT for the terms) |
4 | 4 | ||
5 | DESCRIPTION = "Freescale alsa-lib plugins" | 5 | DESCRIPTION = "Freescale alsa-lib plugins" |
@@ -19,9 +19,9 @@ inherit autotools pkgconfig use-imx-headers | |||
19 | 19 | ||
20 | PV = "1.0.26+${SRCPV}" | 20 | PV = "1.0.26+${SRCPV}" |
21 | 21 | ||
22 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" | 22 | SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" |
23 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 23 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
24 | SRCREV = "0f32bca96f7027c0c1145b27d1790541d34fb84c" | 24 | SRCREV = "a9643b8820dd89b7a8c99941a90e9498f1b68c14" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
27 | 27 | ||
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 | |||
184 | file://0005-msdk-fix-includedir-path.patch \ | 184 | file://0005-msdk-fix-includedir-path.patch \ |
185 | " | 185 | " |
186 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 186 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " |
187 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" | 187 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
188 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 188 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
189 | SRCREV = "63a55f06f7e8f21b483c6d70d50389beb2e85e37" | 189 | SRCREV = "a9c9d17bb3fc94f49f9c17fd965090949b7ba1cd" |
190 | 190 | ||
191 | S = "${WORKDIR}/git" | 191 | S = "${WORKDIR}/git" |
192 | 192 | ||
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 = " \ | |||
113 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 113 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
114 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" | 114 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" |
115 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 115 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
116 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" | 116 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
117 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 117 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
118 | SRCREV = "4b8559690bf7a66745cc65900baccd955b436d3c" | 118 | SRCREV = "db100facd1b3601c225bfac2fae7abc9f7a5f92c" |
119 | 119 | ||
120 | S = "${WORKDIR}/git" | 120 | S = "${WORKDIR}/git" |
121 | 121 | ||
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', '', ' | |||
99 | 99 | ||
100 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" | 100 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" |
101 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 101 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
102 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" | 102 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
103 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 103 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
104 | SRCREV = "4c58a36cfd4b2b16d8978b9592145fb46bb58732" | 104 | SRCREV = "b83d1e4a3cd702bbe0cf4544aa2acc55796e4a0f" |
105 | 105 | ||
106 | S = "${WORKDIR}/git" | 106 | S = "${WORKDIR}/git" |
107 | 107 | ||
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" | |||
88 | # Use i.MX fork of GST for customizations | 88 | # Use i.MX fork of GST for customizations |
89 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | 89 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" |
90 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 90 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
91 | GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" | 91 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
92 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 92 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
93 | SRCREV = "7afc123bc6974d68795f97466eb83ec7a093fb9b" | 93 | SRCREV = "7afc123bc6974d68795f97466eb83ec7a093fb9b" |
94 | 94 | ||
95 | S = "${WORKDIR}/git" | 95 | 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" | |||
22 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | 22 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ |
23 | file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" | 23 | file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" |
24 | 24 | ||
25 | SRC_URI = "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" | 25 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" |
26 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 26 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
27 | SRCREV = "d0b26997556983c99d7b3e7663577f090df36240" | 27 | SRCREV = "f4410b70e8cb49ec0d522bb0681c5d9178cfc216" |
28 | 28 | ||
29 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
30 | 30 | ||
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 @@ | |||
5 | DESCRIPTION = "Freescale Multimedia codec libs" | 5 | DESCRIPTION = "Freescale Multimedia codec libs" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
9 | 9 | ||
10 | # Backward compatibility | 10 | # Backward compatibility |
11 | PROVIDES += "libfslcodec" | 11 | PROVIDES += "libfslcodec" |
12 | 12 | ||
13 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" | 13 | SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" |
14 | SRC_URI[md5sum] = "5041d6e438c7779dcb424aedc11dd3ef" | 14 | SRC_URI[md5sum] = "a905c211e352c6d2f511603e21c6ec26" |
15 | SRC_URI[sha256sum] = "71bcb80bda44a326704d18b2e828b03c6f70792a4bf0686abc223657061df89b" | 15 | SRC_URI[sha256sum] = "e7ab2c84d3d0d0eff258c45c15a27e3bb22082e73b41cf9d169a68dbdd705529" |
16 | 16 | ||
17 | inherit fsl-eula-unpack autotools pkgconfig | 17 | inherit fsl-eula-unpack autotools pkgconfig |
18 | 18 | ||
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 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP" | 3 | DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
6 | 6 | ||
7 | inherit fsl-eula-unpack autotools pkgconfig | 7 | inherit fsl-eula-unpack autotools pkgconfig |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "371a550b9ade88cf355d45c68813f375" | 11 | SRC_URI[md5sum] = "bb533c612e688d1ad0de028f19fefbf5" |
12 | SRC_URI[sha256sum] = "4307c0a625c73a1a1e5ab321834488d52471c434807ab81b9dd038b4cff5903b" | 12 | SRC_URI[sha256sum] = "8f26dd1bdd08c4136da0fd67342cbac1c5c2f95a0dc33b1d71a64e0f8e1938a7" |
13 | 13 | ||
14 | # Fix strip command failed: 'Unable to recognise the format of the input file' | 14 | # Fix strip command failed: 'Unable to recognise the format of the input file' |
15 | INHIBIT_PACKAGE_STRIP = "1" | 15 | 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 @@ | |||
2 | 2 | ||
3 | DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries" | 3 | DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries" |
4 | LICENSE = "Proprietary" | 4 | LICENSE = "Proprietary" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
6 | 6 | ||
7 | inherit fsl-eula-unpack autotools pkgconfig | 7 | inherit fsl-eula-unpack autotools pkgconfig |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
10 | 10 | ||
11 | SRC_URI[md5sum] = "34f77ef1078b842e4cd67dc87c4c35a1" | 11 | SRC_URI[md5sum] = "71e18d4518551f665fa0258ccf6605b0" |
12 | SRC_URI[sha256sum] = "c484a29ab880e8f7ec84d7df736bfa37817c41e64802f07140e9752ba9cd7956" | 12 | SRC_URI[sha256sum] = "7441cf3cbdc12058f2841a708b1374c637d2a171cca17a348338ebf4580a417e" |
13 | 13 | ||
14 | EXTRA_OECONF = " \ | 14 | EXTRA_OECONF = " \ |
15 | -datadir=${base_libdir}/firmware \ | 15 | -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 @@ | |||
5 | DESCRIPTION = "Freescale Multimedia parser libs" | 5 | DESCRIPTION = "Freescale Multimedia parser libs" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
9 | 9 | ||
10 | # For backwards compatibility | 10 | # For backwards compatibility |
11 | PROVIDES += "libfslparser" | 11 | PROVIDES += "libfslparser" |
@@ -14,8 +14,8 @@ RPROVIDES:${PN} = "libfslparser" | |||
14 | RCONFLICTS:${PN} = "libfslparser" | 14 | RCONFLICTS:${PN} = "libfslparser" |
15 | 15 | ||
16 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" | 16 | SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" |
17 | SRC_URI[md5sum] = "5054251389f43702fd29da9668bd3dea" | 17 | SRC_URI[md5sum] = "33341cfbc387a881d82c5197b86a4544" |
18 | SRC_URI[sha256sum] = "caf2757baa936ffe0e992f8e6c3121932f5b497cebfbf20048ba93b26626c4d7" | 18 | SRC_URI[sha256sum] = "680080293df869393028c58ccb2642b724f4b2297f2cbd7b98877a81e4cd6d03" |
19 | 19 | ||
20 | inherit fsl-eula-unpack autotools pkgconfig | 20 | inherit fsl-eula-unpack autotools pkgconfig |
21 | 21 | ||
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 @@ | |||
1 | # Copyright (C) 2013-2016 Freescale Semiconductor | 1 | # Copyright (C) 2013-2016 Freescale Semiconductor |
2 | # Copyright (C) 2017-2021 NXP | 2 | # Copyright 2017-2022 NXP |
3 | # Released under the MIT license (see COPYING.MIT for the terms) | 3 | # Released under the MIT license (see COPYING.MIT for the terms) |
4 | 4 | ||
5 | DESCRIPTION = "Freescale Multimedia VPU wrapper" | 5 | DESCRIPTION = "Freescale Multimedia VPU wrapper" |
6 | LICENSE = "Proprietary" | 6 | LICENSE = "Proprietary" |
7 | SECTION = "multimedia" | 7 | SECTION = "multimedia" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d3c315c6eaa43e07d8c130dc3a04a011" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe" |
9 | 9 | ||
10 | DEPENDS = "virtual/imxvpu" | 10 | DEPENDS = "virtual/imxvpu" |
11 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" | 11 | DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" | 13 | SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}" |
14 | SRCBRANCH = "MM_04.07.00_2205_L5.15.y" | 14 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" |
15 | SRCREV = "0e417b0ade3e55b5fb639d20c419b05aa31ab329" | 15 | SRCREV = "bb1a5f300eec0b89d7127446eb78d479c23ff7da" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
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 | |||
31 | =================================================================== | 31 | =================================================================== |
32 | --- git.orig/samples/dnn/classification.cpp | 32 | --- git.orig/samples/dnn/classification.cpp |
33 | +++ git/samples/dnn/classification.cpp | 33 | +++ git/samples/dnn/classification.cpp |
34 | @@ -11,6 +11,7 @@ std::string keys = | 34 | @@ -12,6 +12,7 @@ std::string keys = |
35 | "{ help h | | Print help message. }" | 35 | "{ help h | | Print help message. }" |
36 | "{ @alias | | An alias name of model to extract preprocessing parameters from models.yml file. }" | 36 | "{ @alias | | An alias name of model to extract preprocessing parameters from models.yml file. }" |
37 | "{ zoo | models.yml | An optional path to file with preprocessing parameters }" | 37 | "{ zoo | models.yml | An optional path to file with preprocessing parameters }" |
@@ -39,7 +39,7 @@ Index: git/samples/dnn/classification.cpp | |||
39 | "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" | 39 | "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" |
40 | "{ initial_width | 0 | Preprocess input image by initial resizing to a specific width.}" | 40 | "{ initial_width | 0 | Preprocess input image by initial resizing to a specific width.}" |
41 | "{ initial_height | 0 | Preprocess input image by initial resizing to a specific height.}" | 41 | "{ initial_height | 0 | Preprocess input image by initial resizing to a specific height.}" |
42 | @@ -102,7 +103,7 @@ int main(int argc, char** argv) | 42 | @@ -113,7 +114,7 @@ int main(int argc, char** argv) |
43 | if (parser.has("input")) | 43 | if (parser.has("input")) |
44 | cap.open(parser.get<String>("input")); | 44 | cap.open(parser.get<String>("input")); |
45 | else | 45 | else |
@@ -48,19 +48,21 @@ Index: git/samples/dnn/classification.cpp | |||
48 | //! [Open a video file or an image file or a camera stream] | 48 | //! [Open a video file or an image file or a camera stream] |
49 | 49 | ||
50 | // Process frames. | 50 | // Process frames. |
51 | @@ -151,13 +152,13 @@ int main(int argc, char** argv) | 51 | @@ -195,14 +196,14 @@ int main(int argc, char** argv) |
52 | double freq = getTickFrequency() / 1000; | 52 | } |
53 | double t = net.getPerfProfile(layersTimes) / freq; | 53 | std::string label = format("Inference time of 1 round: %.2f ms", t1); |
54 | std::string label = format("Inference time: %.2f ms", t); | 54 | std::string label2 = format("Average time of 200 rounds: %.2f ms", timeRecorder.getTimeMilli()/200); |
55 | - putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); | 55 | - putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); |
56 | - putText(frame, label2, Point(0, 35), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); | ||
56 | + putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); | 57 | + putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); |
58 | + putText(frame, label2, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); | ||
57 | 59 | ||
58 | // Print predicted class. | 60 | // Print predicted class. |
59 | label = format("%s: %.4f", (classes.empty() ? format("Class #%d", classId).c_str() : | 61 | label = format("%s: %.4f", (classes.empty() ? format("Class #%d", classId).c_str() : |
60 | classes[classId].c_str()), | 62 | classes[classId].c_str()), |
61 | confidence); | 63 | confidence); |
62 | - putText(frame, label, Point(0, 40), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); | 64 | - putText(frame, label, Point(0, 55), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); |
63 | + putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); | 65 | + putText(frame, label, Point(0, 70), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); |
64 | 66 | ||
65 | imshow(kWinName, frame); | 67 | imshow(kWinName, frame); |
66 | } | 68 | } |
@@ -68,7 +70,7 @@ Index: git/samples/dnn/object_detection.cpp | |||
68 | =================================================================== | 70 | =================================================================== |
69 | --- git.orig/samples/dnn/object_detection.cpp | 71 | --- git.orig/samples/dnn/object_detection.cpp |
70 | +++ git/samples/dnn/object_detection.cpp | 72 | +++ git/samples/dnn/object_detection.cpp |
71 | @@ -251,13 +251,13 @@ int main(int argc, char** argv) | 73 | @@ -260,13 +260,13 @@ int main(int argc, char** argv) |
72 | if (predictionsQueue.counter > 1) | 74 | if (predictionsQueue.counter > 1) |
73 | { | 75 | { |
74 | std::string label = format("Camera: %.2f FPS", framesQueue.getFPS()); | 76 | std::string label = format("Camera: %.2f FPS", framesQueue.getFPS()); |
@@ -85,7 +87,7 @@ Index: git/samples/dnn/object_detection.cpp | |||
85 | } | 87 | } |
86 | imshow(kWinName, frame); | 88 | imshow(kWinName, frame); |
87 | } | 89 | } |
88 | @@ -293,7 +293,7 @@ int main(int argc, char** argv) | 90 | @@ -302,7 +302,7 @@ int main(int argc, char** argv) |
89 | double freq = getTickFrequency() / 1000; | 91 | double freq = getTickFrequency() / 1000; |
90 | double t = net.getPerfProfile(layersTimes) / freq; | 92 | double t = net.getPerfProfile(layersTimes) / freq; |
91 | std::string label = format("Inference time: %.2f ms", t); | 93 | std::string label = format("Inference time: %.2f ms", t); |
@@ -94,7 +96,7 @@ Index: git/samples/dnn/object_detection.cpp | |||
94 | 96 | ||
95 | imshow(kWinName, frame); | 97 | imshow(kWinName, frame); |
96 | } | 98 | } |
97 | @@ -462,7 +462,7 @@ void drawPred(int classId, float conf, i | 99 | @@ -471,7 +471,7 @@ void drawPred(int classId, float conf, i |
98 | top = max(top, labelSize.height); | 100 | top = max(top, labelSize.height); |
99 | rectangle(frame, Point(left, top - labelSize.height), | 101 | rectangle(frame, Point(left, top - labelSize.height), |
100 | Point(left + labelSize.width, top + baseLine), Scalar::all(255), FILLED); | 102 | Point(left + labelSize.width, top + baseLine), Scalar::all(255), FILLED); |
@@ -107,7 +109,7 @@ Index: git/samples/dnn/segmentation.cpp | |||
107 | =================================================================== | 109 | =================================================================== |
108 | --- git.orig/samples/dnn/segmentation.cpp | 110 | --- git.orig/samples/dnn/segmentation.cpp |
109 | +++ git/samples/dnn/segmentation.cpp | 111 | +++ git/samples/dnn/segmentation.cpp |
110 | @@ -157,7 +157,7 @@ int main(int argc, char** argv) | 112 | @@ -162,7 +162,7 @@ int main(int argc, char** argv) |
111 | double freq = getTickFrequency() / 1000; | 113 | double freq = getTickFrequency() / 1000; |
112 | double t = net.getPerfProfile(layersTimes) / freq; | 114 | double t = net.getPerfProfile(layersTimes) / freq; |
113 | std::string label = format("Inference time: %.2f ms", t); | 115 | 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 @@ | |||
3 | # recipe. The second section customizes the recipe for i.MX. | 3 | # recipe. The second section customizes the recipe for i.MX. |
4 | 4 | ||
5 | ########## meta-openembedded copy ########### | 5 | ########## meta-openembedded copy ########### |
6 | # Upstream hash: 6b7cf95e75cbfc08cf1f6eddc7ce3f6a0a39edcf | ||
7 | # plus LICENSE_FLAGS_ACCEPTED fix | ||
6 | 8 | ||
7 | SUMMARY = "Opencv : The Open Computer Vision Library" | 9 | SUMMARY = "Opencv : The Open Computer Vision Library" |
8 | HOMEPAGE = "http://opencv.org/" | 10 | HOMEPAGE = "http://opencv.org/" |
@@ -16,8 +18,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" | |||
16 | 18 | ||
17 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" | 19 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" |
18 | 20 | ||
19 | SRCREV_opencv = "69357b1e88680658a07cffde7678a4d697469f03" | 21 | SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" |
20 | SRCREV_contrib = "f5d7f6712d4ff229ba4f45cf79dfd11c557d56fd" | 22 | SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" |
21 | SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" | 23 | SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" |
22 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 24 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
23 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 25 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
@@ -45,22 +47,20 @@ IPP_MD5 = "${@ipp_md5sum(d)}" | |||
45 | 47 | ||
46 | SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" | 48 | SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" |
47 | SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ | 49 | SRC_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;branch=master;protocol=https \ | 50 | git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=master;protocol=https \ |
49 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \ | 51 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=git/ipp;name=ipp;protocol=https \ |
50 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \ | 52 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ |
51 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \ | 53 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ |
52 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \ | 54 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ |
53 | git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \ | 55 | git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ |
54 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ | 56 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ |
55 | file://0003-To-fix-errors-as-following.patch \ | 57 | file://0003-To-fix-errors-as-following.patch \ |
56 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ | 58 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ |
57 | file://0001-Dont-use-isystem.patch \ | 59 | file://0001-Dont-use-isystem.patch \ |
58 | file://download.patch \ | 60 | file://download.patch \ |
59 | file://0001-Make-ts-module-external.patch \ | 61 | file://0001-Make-ts-module-external.patch \ |
60 | file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ | ||
61 | file://0001-Use-the-one-argument-version-of-SetTotalBytesLimit.patch \ | ||
62 | " | 62 | " |
63 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" | 63 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" |
64 | 64 | ||
65 | S = "${WORKDIR}/git" | 65 | S = "${WORKDIR}/git" |
66 | 66 | ||
@@ -69,7 +69,7 @@ S = "${WORKDIR}/git" | |||
69 | OPENCV_DLDIR = "${WORKDIR}/downloads" | 69 | OPENCV_DLDIR = "${WORKDIR}/downloads" |
70 | 70 | ||
71 | do_unpack_extra() { | 71 | do_unpack_extra() { |
72 | tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} | 72 | tar xzf ${S}/ipp/ippicv/${IPP_FILENAME} -C ${S} |
73 | 73 | ||
74 | md5() { | 74 | md5() { |
75 | # Return the MD5 of $1 | 75 | # Return the MD5 of $1 |
@@ -84,22 +84,22 @@ do_unpack_extra() { | |||
84 | test -e $DEST || ln -s $F $DEST | 84 | test -e $DEST || ln -s $F $DEST |
85 | done | 85 | done |
86 | } | 86 | } |
87 | cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i | 87 | cache xfeatures2d/boostdesc ${S}/boostdesc/*.i |
88 | cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i | 88 | cache xfeatures2d/vgg ${S}/vgg/*.i |
89 | cache data ${WORKDIR}/face/*.dat | 89 | cache data ${S}/face/*.dat |
90 | cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel | 90 | cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel |
91 | cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt | 91 | cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt |
92 | } | 92 | } |
93 | addtask unpack_extra after do_unpack before do_patch | 93 | addtask unpack_extra after do_unpack before do_patch |
94 | 94 | ||
95 | CMAKE_VERBOSE = "VERBOSE=1" | 95 | CMAKE_VERBOSE = "VERBOSE=1" |
96 | 96 | ||
97 | EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ | 97 | EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ |
98 | -DWITH_1394=OFF \ | 98 | -DWITH_1394=OFF \ |
99 | -DENABLE_PRECOMPILED_HEADERS=OFF \ | 99 | -DENABLE_PRECOMPILED_HEADERS=OFF \ |
100 | -DCMAKE_SKIP_RPATH=ON \ | 100 | -DCMAKE_SKIP_RPATH=ON \ |
101 | -DOPENCV_ICV_HASH=${IPP_MD5} \ | 101 | -DOPENCV_ICV_HASH=${IPP_MD5} \ |
102 | -DIPPROOT=${WORKDIR}/ippicv_lnx \ | 102 | -DIPPROOT=${S}/ippicv_lnx \ |
103 | -DOPENCV_GENERATE_PKGCONFIG=ON \ | 103 | -DOPENCV_GENERATE_PKGCONFIG=ON \ |
104 | -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ | 104 | -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ |
105 | -DOPENCV_ALLOW_DOWNLOADS=OFF \ | 105 | -DOPENCV_ALLOW_DOWNLOADS=OFF \ |
@@ -107,7 +107,13 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ | |||
107 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ | 107 | ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ |
108 | ${@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)} \ | 108 | ${@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)} \ |
109 | " | 109 | " |
110 | LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" | ||
111 | LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" | ||
112 | |||
110 | EXTRA_OECMAKE:append:x86 = " -DX86=ON" | 113 | EXTRA_OECMAKE:append:x86 = " -DX86=ON" |
114 | # disable sse4.1 and sse4.2 to fix 32bit build failure | ||
115 | # https://github.com/opencv/opencv/issues/21597 | ||
116 | EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" | ||
111 | 117 | ||
112 | PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ | 118 | PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ |
113 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | 119 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ |
@@ -167,10 +173,10 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', ' | |||
167 | 173 | ||
168 | python populate_packages:prepend () { | 174 | python populate_packages:prepend () { |
169 | cv_libdir = d.expand('${libdir}') | 175 | cv_libdir = d.expand('${libdir}') |
170 | do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) | 176 | do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) |
171 | do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 177 | do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
172 | do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') | 178 | do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') |
173 | do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) | 179 | do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) |
174 | 180 | ||
175 | pn = d.getVar('PN') | 181 | pn = d.getVar('PN') |
176 | metapkg = pn + '-dev' | 182 | metapkg = pn + '-dev' |
@@ -251,14 +257,14 @@ SUMMARY = "Opencv : The Open Computer Vision Library, i.MX Fork" | |||
251 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 257 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
252 | 258 | ||
253 | # Replace the opencv URL with the fork | 259 | # Replace the opencv URL with the fork |
254 | SRCREV_opencv = "5423d53ae0d116ee5bbe52f8b5503f0cd8586998" | 260 | SRCREV_opencv = "d3440df40a6e90cd1d2a1b729bcbc16aa4d42f5d" |
255 | OPENCV_SRC ?= "git://source.codeaurora.org/external/imx/opencv-imx.git;protocol=https;branch=master" | 261 | OPENCV_SRC ?= "git://github.com/nxp-imx/opencv-imx.git;protocol=https;branch=master" |
256 | SRCBRANCH = "4.5.2_imx" | 262 | SRCBRANCH = "4.6.0_imx" |
257 | SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https" | 263 | SRC_URI:remove = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https" |
258 | SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv" | 264 | SRC_URI =+ "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv" |
259 | 265 | ||
260 | # Add opencv_extra | 266 | # Add opencv_extra |
261 | SRCREV_extra = "855c4528402e563283f86f28c6393f57eb5dcf62" | 267 | SRCREV_extra = "936854e2b666853d6d0732a8eabc2d699f4fa3d8" |
262 | SRC_URI += " \ | 268 | SRC_URI += " \ |
263 | git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \ | 269 | git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra;branch=master;protocol=https \ |
264 | file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ | 270 | file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ |
@@ -281,7 +287,13 @@ PACKAGECONFIG:append = " ${PACKAGECONFIG_OPENCL}" | |||
281 | 287 | ||
282 | PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," | 288 | PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," |
283 | 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," | 289 | 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," |
290 | PACKAGECONFIG[qt6] = "-DWITH_QT=ON -DQT_HOST_PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native},-DWITH_QT=OFF,qtbase qtbase-native," | ||
284 | PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF," | 291 | PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF," |
292 | PACKAGECONFIG[tim-vx] = "-DWITH_TIMVX=ON -DTIMVX_INSTALL_DIR=${STAGING_DIR_HOST}${libdir},-DWITH_TIMVX=OFF,tim-vx" | ||
293 | |||
294 | # Disable cvv module in opencv_contrib as it is not yet suppported for Qt6 | ||
295 | # (opencv debug framework) | ||
296 | EXTRA_OECMAKE:append = " -DBUILD_opencv_cvv=OFF" | ||
285 | 297 | ||
286 | do_install:append() { | 298 | do_install:append() { |
287 | ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 | 299 | ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 |