Commit Graph

23 Commits

Author SHA1 Message Date
Max Krummenacher
01a7d1c67b recipes: fix whitespace warnings
Fix some more whitspace warnings.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2025-04-26 12:09:22 +02:00
Andrej Valek
d025faa488 fix(opencv): do not try to install sample files
- don't install sample files if PACKAGECONFIG:samples is disabled

Signed-off-by: Andrej Valek <andrej.v@skyrain.eu>
2025-04-17 09:02:07 +02:00
Timo Schuster
92b12be6c5 opencv: Specify right path for <numpy/ndarrayobject.h>
Signed-off-by: Timo Schuster <timo.schuster@leica-microsystems.com>
2025-04-02 15:40:46 +02:00
Timo Schuster
96e0aab9e5 opencv: Adapt recipe to changes in unpack directories introduced with styhead
Signed-off-by: Timo Schuster <timo.schuster@leica-microsystems.com>
2024-10-09 12:20:35 +02:00
Timo Schuster
e0bdbc6157 opencv: Integrate 225ce6a14a to fix build protobuf v22 and dnn enabled 2023-10-12 14:39:57 +02:00
Khem Raj
f724cfced0 recipes: Add missing patch tag Upstream-Status
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-06-21 18:33:11 -07:00
Tom Hochstein
39f309f3d3 opencv: Fix override for i.MX 8M Nano UltraLite SOC
The SOC override leaked early with a different name.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-02-20 09:44:28 -07:00
Tom Hochstein
575f7896da opencv: Add support for i.MX 9
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-02-17 13:46:35 -07:00
Tom Hochstein
3362cb2a0f opencv: Update copied recipe to latest
Also fix the variable ordering for the SRC_URI overrides.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2023-01-12 11:34:01 -07:00
Max Krummenacher
5554647fa1 opencv: imx: update the i.mx fork to 4.6.0
- 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-11-25 12:09:04 +01:00
Max Krummenacher
697f7f3387 opencv: follow oe-core's variable name changes
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-03-06 11:13:59 +01:00
Otavio Salvador
30f5ce1d21 Generalize overrides subsystem for NXP and Mainline support
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-02-21 20:06:28 -03:00
Max Krummenacher
4dda991038 opencv: imx: stop fetching tiny-dnn
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] f7ca9ef279

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
2022-01-22 12:40:02 +01:00
Max Krummenacher
8bcfaa71e0 opencv: imx: prevent warning about distutils
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>
2022-01-22 12:07:46 +01:00
Tom Hochstein
dc3ea70ff5 opencv: Backport updates from OE-Core
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-03 21:23:36 -05:00
Pierre-Jean Texier
bef00d6e4f recipes: use https protocol and add explicit branch parameter
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-11-03 22:27:01 +01:00
Tom Hochstein
248273e8ad opencv: Undo conversion of SRCREV_extra
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-12 10:08:24 -07:00
Khem Raj
59d36c9832 layer: Convert to new override syntax
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-08-12 10:08:24 -07:00
Tom Hochstein
5dba941277 Drop overrides for i.MX 8DXL Phantom MEK
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-21 19:16:45 -03:00
Tom Hochstein
7462ae5636 opencv: Fix SRC_URI
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-05-04 14:06:25 -03:00
Tom Hochstein
a5fc688726 opencv: Adapt patch for upgrade to 4.5.2.imx
The patch file OpenCV_DNN_examples.patch is broken after upgrading
opencv to 4.5.2.imx. Fix the patch.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
2021-05-04 14:06:25 -03:00
Tom Hochstein
8118f36fd5 opencv: Upgrade to 4.5.2.imx
- 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>
2021-04-30 18:34:39 -03:00
Chris Dimich
dc6bebac65 opencv_4.4.0.imx: add recipe
Add recipe to support additional machine learning demos and tiny dnn.

Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
2021-03-02 18:34:38 -03:00