mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv4: propagate internal dependencies

Browse Source 
Commit e229943785 (package/opencv4: BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
requires BR2_PACKAGE_OPENCV4_LIB_DNN) forgot to propagate the dependency
to the internal stitching option, and to the contrib options dpm, face,
and xobjdetect, causing unmet dependencies warning (unfortunately, not
errors) such as:

    $ KCONFIG_SEED=0x9F66F854 make randconfig
    WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
      Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y]
      Selected by [y]:
      - BR2_PACKAGE_OPENCV4_LIB_STITCHING [=y] && BR2_PACKAGE_OPENCV4 [=y]
      - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y]

Propagate the dependencies.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Woodrow Douglass <wdouglass@carnegierobotics.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b553c9123b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN
2024-01-28 14:20:57 +01:00
committed by Peter Korsgaard
parent cd6a1977c6
commit 1978740480
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package/opencv4-contrib/Config.in
View File

@@ -95,18 +95,30 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM
bool "dpm" bool "dpm"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect
depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect
select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
help help
Deformable Part Model -- Felzenszwalb's Cascade with Deformable Part Model -- Felzenszwalb's Cascade with
deformable parts object recognition code. deformable parts object recognition code.
comment "dpm needs a glibc or musl toolchain"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect
depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE
bool "face" bool "face"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect
depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect
select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
help help
Face Recognition -- Face recognition techniques: Eigen, Fisher Face Recognition -- Face recognition techniques: Eigen, Fisher
and Local Binary Pattern Histograms LBPH methods. and Local Binary Pattern Histograms LBPH methods.
comment "face needs a glibc or musl toolchain"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect
depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE
bool "freetype" bool "freetype"
help help
@@ -317,12 +329,18 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT
bool "xobjdetect" bool "xobjdetect"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect
depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect
select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
help help
Boosted 2D Object Detection -- Uses a Waldboost cascade and Boosted 2D Object Detection -- Uses a Waldboost cascade and
local binary patterns computed as integral features for 2D local binary patterns computed as integral features for 2D
object detection. object detection.
comment "xobjdetect needs a glibc or musl toolchain"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect
depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO
bool "xphoto" bool "xphoto"
select BR2_PACKAGE_OPENCV4_LIB_PHOTO select BR2_PACKAGE_OPENCV4_LIB_PHOTO

6
package/opencv4/Config.in
View File

@@ -203,6 +203,8 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE
config BR2_PACKAGE_OPENCV4_LIB_STITCHING config BR2_PACKAGE_OPENCV4_LIB_STITCHING
bool "stitching" bool "stitching"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect
depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect
select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_CALIB3D
select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D
select BR2_PACKAGE_OPENCV4_LIB_IMGPROC select BR2_PACKAGE_OPENCV4_LIB_IMGPROC
@@ -211,6 +213,10 @@ config BR2_PACKAGE_OPENCV4_LIB_STITCHING
Include opencv_stitching (images stitching) module into the Include opencv_stitching (images stitching) module into the
OpenCV build. OpenCV build.
comment "stitching needs a glibc or musl toolchain"
depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_UCLIBC
config BR2_PACKAGE_OPENCV4_LIB_SUPERRES config BR2_PACKAGE_OPENCV4_LIB_SUPERRES
bool "superres" bool "superres"
select BR2_PACKAGE_OPENCV4_LIB_IMGPROC select BR2_PACKAGE_OPENCV4_LIB_IMGPROC