Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -17,70 +17,105 @@ comment "OpenCV modules"
|
||||
config BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
bool "calib3d"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_calib3d module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_CONTRIB
|
||||
bool "contrib"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_ML
|
||||
select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
help
|
||||
Include opencv_contrib module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
bool "features2d"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_FLANN
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_features2d module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_FLANN
|
||||
bool "flann"
|
||||
default y
|
||||
# opencv_core dependency is already enabled
|
||||
help
|
||||
Include opencv_flann module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_GPU
|
||||
bool "gpu"
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_LEGACY
|
||||
select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
|
||||
select BR2_PACKAGE_OPENCV_LIB_PHOTO
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
Include opencv_gpu module into the OpenCV build.
|
||||
|
||||
comment "gpu module needs a toolchain w/ dynamic libraries"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_HIGHGUI
|
||||
bool "highgui"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_highgui module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
bool "imgproc"
|
||||
default y
|
||||
# opencv_core dependency is already enabled
|
||||
help
|
||||
Include opencv_imgproc module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_LEGACY
|
||||
bool "legacy"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_ML
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
help
|
||||
Include opencv_legacy module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_ML
|
||||
bool "ml (machine learning)"
|
||||
default y
|
||||
# opencv_core dependency is already enabled
|
||||
help
|
||||
Include opencv_ml module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_NONFREE
|
||||
bool "nonfree"
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_nonfree module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_OBJDETECT
|
||||
bool "objdetect"
|
||||
default y
|
||||
# opencv_core dependency is already enabled
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_objdetect module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_PHOTO
|
||||
bool "photo"
|
||||
default y
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Binutils 2.25 nios2 issue
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_photo module into the OpenCV build.
|
||||
|
||||
@@ -89,50 +124,77 @@ comment "opencv_python module requires numpy which is not yet available."
|
||||
config BR2_PACKAGE_OPENCV_LIB_STITCHING
|
||||
bool "stitching"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
|
||||
help
|
||||
Include opencv_stitching module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_SUPERRES
|
||||
bool "superres"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
help
|
||||
Include opencv_superres "super resolution" - module into the OpenCV
|
||||
build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_TS
|
||||
bool "ts (touchscreen)"
|
||||
select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
|
||||
default y
|
||||
# opencv_core dependency is already enabled
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
help
|
||||
Include opencv_ts module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
bool "video"
|
||||
default y
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
help
|
||||
Include opencv_video module into the OpenCV build.
|
||||
|
||||
config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB
|
||||
bool "videostab"
|
||||
default y
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
|
||||
select BR2_PACKAGE_OPENCV_LIB_CALIB3D
|
||||
select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
|
||||
select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
|
||||
select BR2_PACKAGE_OPENCV_LIB_IMGPROC
|
||||
select BR2_PACKAGE_OPENCV_LIB_PHOTO
|
||||
select BR2_PACKAGE_OPENCV_LIB_VIDEO
|
||||
help
|
||||
Include opencv_videostab module into the OpenCV build.
|
||||
|
||||
if !BR2_STATIC_LIBS
|
||||
|
||||
comment "Test sets"
|
||||
|
||||
config BR2_PACKAGE_OPENCV_BUILD_TESTS
|
||||
bool "build tests"
|
||||
|
||||
config BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS
|
||||
bool "build performance tests"
|
||||
|
||||
endif
|
||||
|
||||
comment "Tests sets need a toolchain w/ dynamic libraries"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
comment "3rd party support"
|
||||
|
||||
config BR2_PACKAGE_OPENCV_WITH_FFMPEG
|
||||
bool "ffmpeg support"
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_BZIP2
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE
|
||||
depends on !BR2_nios2 # ffmpeg
|
||||
help
|
||||
Use ffmpeg from the target system.
|
||||
|
||||
@@ -210,6 +272,7 @@ config BR2_PACKAGE_OPENCV_WITH_QT
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # qt
|
||||
depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
|
||||
select BR2_PACKAGE_QT
|
||||
select BR2_PACKAGE_QT_STL
|
||||
select BR2_PACKAGE_QT_GUI_MODULE
|
||||
@@ -217,6 +280,9 @@ config BR2_PACKAGE_OPENCV_WITH_QT
|
||||
help
|
||||
Use Qt with QtTest module and STL support
|
||||
|
||||
comment "qt backend support needs a toolchain not affected by Binutils bug 19405"
|
||||
depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
|
||||
|
||||
config BR2_PACKAGE_OPENCV_WITH_TIFF
|
||||
bool "tiff support"
|
||||
select BR2_PACKAGE_TIFF
|
||||
|
||||
Reference in New Issue
Block a user