aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-support/opencv/opencv_4.5.2.imx.bb
AgeCommit message (Collapse)Author
2022-11-25opencv: imx: update the i.mx fork to 4.6.0Max Krummenacher
- Pull in the 4.6.0 meta-openembedded copy plus https://lore.kernel.org/all/20221121180529.3358952-1-max.oss.09@gmail.com/ - OpenCV_DNN_examples.patch taken from meta-imx - Adapt the PREFERRED_VERSION Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-03-06opencv: follow oe-core's variable name changesMax Krummenacher
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-02-21Generalize overrides subsystem for NXP and Mainline supportOtavio Salvador
Essentially, we extend the overrides to a generic-bsp, nxp-bsp, and mainline-bsp. So, for example, the mx8mq override is split into: - imx-generic-bsp: compatible with every i.MX SoC and both BSP variants - imx-nxp-bsp: compatible with every i.MX SoC but specific to NXP BSP - imx-mainline-bsp: compatible with every i.MX SoC but specific to Mainline BSP - mx8-generic-bsp: compatible with every i.MX8 SoC and both BSP variants - mx8-nxp-bsp: compatible with every i.MX8 SoC but specific to NXP BSP - mx8-mainline-bsp: compatible with every i.MX8 SoC but specific to Mainline BSP - mx8m-generic-bsp: compatible with every i.MX8M SoC and both BSP variants - mx8m-nxp-bsp: compatible with every i.MX8M SoC but specific to NXP BSP - mx8m-mainline-bsp: compatible with every i.MX8M SoC but specific to Mainline BSP - mx8mq-generic-bsp: compatible with every i.MX8MQ SoC and both BSP variants - mx8mq-nxp-bsp: compatible with every i.MX8MQ SoC8 but specific to NXP BSP - mx8mq-mainline-bsp: compatible with every i.MX8MQ SoC but specific to Mainline BSP The extender mechanism is responsible for extending the override list to include the generic overrides. We can then use the three different variants to handle the metadata correctly. Generically speaking, the conversion mainly was automated (with a lot of back and forth until getting it right). To convert an existing layer, the following script can be used: ```sh git ls-files classes recipes-* \ | xargs sed -i \ -e 's,:\(mx[6-8]\w*\),:\1-nxp-bsp,g' \ -e 's,(\(mx[6-8]\w*\)),(\1-nxp-bsp),g' \ -e 's,\(mx[6-8]\w*\)|,\1-nxp-bsp|,g' \ -e 's,|\(mx[6-8]\w*\)),|\1-nxp-bsp),g' \ \ -e 's,:\(mx[5s]\w*\),:\1-generic-bsp,g' \ -e 's,(\(mx[5s]\w*\)),(\1-generic-bsp),g' \ -e 's,\(mx[5s]\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(mx[5s]\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(vf\w*\),:\1-generic-bsp,g' \ -e 's,:\(vf[56]0\w*\),:\1-generic-bsp,g' \ -e 's,\(vf\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf\w*\)),|\1-generic-bsp),g' \ -e 's,\(vf[56]0\w*\)|,\1-generic-bsp|,g' \ -e 's,|\(vf[56]0\w*\)),|\1-generic-bsp),g' \ \ -e 's,:\(imx\) ,:\1-nxp-bsp ,g' \ -e 's,(\(imx\)),(\1-nxp-bsp),g' \ -e 's,\(imx\)|,\1-nxp-bsp|,g' \ -e 's,|\(imx\)),|\1-nxp-bsp),g' for d in $(find -type d | egrep '/mx[6-8]w*'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/imx$'); do git mv $d $d-nxp-bsp done for d in $(find -type d | egrep '/mx[5s]w*'); do git mv $d $d-generic-bsp done ``` Fixes: #791. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-01-22opencv: imx: stop fetching tiny-dnnMax Krummenacher
With commit f7ca9ef27 ("cleanup: drop dnn_modern") [1] tiny-dnn is no longer used by any module. There is no need to prefetch it. This was part of OpenCV 3.4.2. Prevents: | WARNING: opencv-4.5.2.imx-r0 do_unpack: QA Issue: opencv: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol [src-uri-bad] [1] https://github.com/opencv/opencv_contrib/commit/f7ca9ef279bbb9d7bbb791548725d91e46725550 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-01-22opencv: imx: prevent warning about distutilsMax Krummenacher
Merge latest opencv recipe in meta-openembedded. Prevents: | WARNING: distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2021-11-03opencv: Backport updates from OE-CoreTom Hochstein
2178fd7386 opencv: remove setup_vars_opencv4.sh cafcc65e74 opencv: fix build with protobuf-3.18 when dnn PACKAGECONFIG is enabled 3c022cd50d opencv: Do not lock to gcc only compiler Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2021-11-03recipes: use https protocol and add explicit branch parameterPierre-Jean Texier
Due to https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git it is required to use https protocol for github repo accessing. Update created with oe-core/scripts/contrib/convert-srcuri.py (see [0]) Fixes: WARNING: /work/meta-freescale/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb: URL: git://github.com/Freescale/u-boot-fslc.git;branch=2021.07+fslc uses git protocol which is no longer supported by github. Please change to ;protocol=https in the url. [0] - https://git.openembedded.org/openembedded-core/tree/scripts/contrib/convert-srcuri.py Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com>
2021-08-12opencv: Undo conversion of SRCREV_extraTom Hochstein
SRCREV_extra is not an override, so keep the underscore here. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-08-12layer: Convert to new override syntaxKhem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-05-21Drop overrides for i.MX 8DXL Phantom MEKTom Hochstein
The i.MX 8DXL Phantom MEK will never be released, so drop the overrides that have crept into the meta-data. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2021-05-04opencv: Fix SRC_URITom Hochstein
The SRC_URI is updated for the base recipe, but the copy of the SRC_URI in the override section doesn't account for this, leading to a build break: ``` | -- wechat_qrcode: Download: detect.caffemodel | CMake Error at /opt/work/upstream/fsl-xwayland/tmp/work/cortexa53-crypto-mx8mp-fsl-linux/opencv/4.5.2.imx-r0/git/cmake/OpenCVDownload.cmake:161 (message): | Not going to download detect.caffemodel ``` Additionally, the SRC_URI is long and complex, and copying it in our override section does make problems like this more likely. Fix the problem and simplify maintenance by replacing the SRC_URI copy with a targetted override. The override section now shows only the changes to SRC_URI. The fix includes these related changes: - a new patch file is added in the base recipe and is now copied locally - the override for SRCREV_contrib is redundant and is dropped Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2021-04-30opencv: Upgrade to 4.5.2.imxTom Hochstein
- Upgrade to the 4.5.2 i.MX fork. - Drop the redundant PV assignment - Adapt the i.MX test packageconfig now that upstream also has one Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>