@@ -95,18 +95,30 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_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
help
Deformable Part Model -- Felzenszwalb's Cascade with
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
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
help
Face Recognition -- Face recognition techniques: Eigen, Fisher
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
bool "freetype"
help
@@ -317,12 +329,18 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_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
help
Boosted 2D Object Detection -- Uses a Waldboost cascade and
local binary patterns computed as integral features for 2D
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
bool "xphoto"
select BR2_PACKAGE_OPENCV4_LIB_PHOTO
@@ -203,6 +203,8 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE
config BR2_PACKAGE_OPENCV4_LIB_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_FEATURES2D
select BR2_PACKAGE_OPENCV4_LIB_IMGPROC
@@ -211,6 +213,10 @@ config BR2_PACKAGE_OPENCV4_LIB_STITCHING
Include opencv_stitching (images stitching) module into the
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
bool "superres"
select BR2_PACKAGE_OPENCV4_LIB_IMGPROC
Commit e22994378553 (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> --- package/opencv4-contrib/Config.in | 18 ++++++++++++++++++ package/opencv4/Config.in | 6 ++++++ 2 files changed, 24 insertions(+)