diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index ad61c3fbe8..529687dd96 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -76,28 +76,32 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT bool "dnn_objdetect" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # opencv4 dnn select BR2_PACKAGE_OPENCV4_LIB_DNN help Object Detection using CNNs -- Implements compact CNN Model for object detection. Trained using Caffe but uses opencv_dnn module. -comment "dnn_objdetect needs a glibc or musl toolchain" +comment "dnn_objdetect needs a glibc or musl toolchain w/ gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES bool "dnn_superres" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # opencv4 dnn select BR2_PACKAGE_OPENCV4_LIB_DNN help Superresolution using CNNs -- Contains four trained convolutional neural networks to upscale images. -comment "dnn_superres needs a glibc or musl toolchain" +comment "dnn_superres needs a glibc or musl toolchain w/ gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED bool "dnns_easily_fooled" @@ -109,27 +113,31 @@ 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 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # 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 +comment "dpm needs a glibc or musl toolchain w/ gcc >= 8" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 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 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # 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 +comment "face needs a glibc or musl toolchain w/ gcc >= 8" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE bool "freetype" @@ -347,15 +355,17 @@ 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 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # 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 +comment "xobjdetect needs a glibc or musl toolchain w/ gcc >= 8" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO bool "xphoto"