Projetos/rpi-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/opencv4-contrib: add missing gcc >= 8 dependencies

Browse Source 
Commit
75ab6cf93a ("package/{python-}protobuf:
bump to version 28.1") added a whole bunch of gcc >= 8 dependencies to
OpenCV 4 options, but forgot to propagate those to opencv4-contrib.

Fixes:

WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_OBJDETECT
  Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=n] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=n]
  Selected by [y]:
  - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=n]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit a67ab908d4f546bda9a94521f3b1f37aea60a365)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
Thomas Petazzoni
2026-01-03 23:43:16 +01:00
committed by Thomas Perale
parent 0744d70e27
commit c5ef366701
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"