rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
bsp/buildroot/package/opencv3/Config.in
View File

@@ -1,15 +1,15 @@
menuconfig BR2_PACKAGE_OPENCV3
bool "opencv3"
select BR2_PACKAGE_ZLIB
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS # include dlfcn.h
depends on !BR2_PACKAGE_OPENCV
select BR2_PACKAGE_ZLIB
help
OpenCV (Open Source Computer Vision) is a library of programming
functions for real time computer vision.
OpenCV (Open Source Computer Vision) is a library of
programming functions for real time computer vision.
Note that the opencv_core module and the opencv_hal library
are always built and installed, not matter which other
@@ -26,8 +26,8 @@ config BR2_PACKAGE_OPENCV3_LIB_CALIB3D
select BR2_PACKAGE_OPENCV3_LIB_FEATURES2D
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
help
Include opencv_calib3d (camera calibration and 3d reconstruction) module
into the OpenCV build.
Include opencv_calib3d (camera calibration and 3d
reconstruction) module into the OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_FEATURES2D
bool "features2d"
@@ -35,15 +35,15 @@ config BR2_PACKAGE_OPENCV3_LIB_FEATURES2D
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_ML
help
Include opencv_features2d (2d features framework) module into the OpenCV
build.
Include opencv_features2d (2d features framework) module
into the OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_FLANN
bool "flann"
# opencv_core dependency is already enabled
help
Include opencv_flann (clustering and search in multi-dimensional spaces)
module into the OpenCV build.
Include opencv_flann (clustering and search in
multi-dimensional spaces) module into the OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
bool "highgui"
@@ -51,8 +51,8 @@ config BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_VIDEOIO
help
Include opencv_highgui (high-level gui and media i/o) module into the
OpenCV build.
Include opencv_highgui (high-level gui and media i/o) module
into the OpenCV build.
if BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
@@ -85,16 +85,16 @@ comment "gtk3 support needs libgtk3"
config BR2_PACKAGE_OPENCV3_WITH_QT
bool "qt4"
depends on BR2_PACKAGE_QT
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT_STL
select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_TEST
help
Use Qt4 with QtTest and QtGui modules and STL support, as GUI toolkit.
Use Qt4 with QtTest and QtGui modules and STL support, as
GUI toolkit.
comment "qt4 support needs qt and a toolchain not affected by Binutils bug 19405"
comment "qt4 support needs qt"
depends on BR2_USE_MMU # qt
depends on (!BR2_PACKAGE_QT && !BR2_PACKAGE_QT5) || BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
config BR2_PACKAGE_OPENCV3_WITH_QT5
bool "qt5"
@@ -104,8 +104,8 @@ config BR2_PACKAGE_OPENCV3_WITH_QT5
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_WIDGETS
help
Use Qt5 with base, concurrent, test, gui and widgets components, as GUI
toolkit.
Use Qt5 with base, concurrent, test, gui and widgets
components, as GUI toolkit.
comment "qt5 support needs qt5"
depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
@@ -130,24 +130,26 @@ comment "opengl support needs an OpenGL provider"
endif # BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
config BR2_PACKAGE_OPENCV3_LIB_IMGCODECS
bool "imgcodecs"
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
help
Include opencv_imgcodecs (image codecs) module into the OpenCV build.
Include opencv_imgcodecs (image codecs) module into the
OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_IMGPROC
bool "imgproc"
# opencv_core dependency is already enabled
help
Include opencv_imgproc (image processing) module into the OpenCV build.
Include opencv_imgproc (image processing) module into the
OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_ML
bool "ml"
# opencv_core dependency is already enabled
help
Include opencv_ml (machine learning) module into the OpenCV build.
Include opencv_ml (machine learning) module into the OpenCV
build.
config BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
bool "objdetect"
@@ -155,14 +157,15 @@ config BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_ML
help
Include opencv_objdetect (object detection) module into the OpenCV build.
Include opencv_objdetect (object detection) module into the
OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_PHOTO
bool "photo"
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
help
Include opencv_photo (computational photography) module into the OpenCV
build.
Include opencv_photo (computational photography) module into
the OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_PYTHON
bool "python"
@@ -170,8 +173,8 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
select BR2_PACKAGE_PYTHON_NUMPY
help
Include opencv_python module into the OpenCV build.
No python example is installed.
Include opencv_python module into the OpenCV build. No
python example is installed.
config BR2_PACKAGE_OPENCV3_LIB_SHAPE
bool "shape"
@@ -179,8 +182,8 @@ config BR2_PACKAGE_OPENCV3_LIB_SHAPE
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_VIDEO
help
Include opencv_shape (shape descriptors and matchers) module into the
OpenCV build.
Include opencv_shape (shape descriptors and matchers) module
into the OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_STITCHING
bool "stitching"
@@ -189,14 +192,16 @@ config BR2_PACKAGE_OPENCV3_LIB_STITCHING
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
help
Include opencv_stitching (images stitching) module into the OpenCV build.
Include opencv_stitching (images stitching) module into the
OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_SUPERRES
bool "superres"
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_VIDEO
help
Include opencv_superres (super resolution) module into the OpenCV build.
Include opencv_superres (super resolution) module into the
OpenCV build.
config BR2_PACKAGE_OPENCV3_LIB_TS
bool "ts"
@@ -213,13 +218,15 @@ config BR2_PACKAGE_OPENCV3_LIB_VIDEOIO
select BR2_PACKAGE_OPENCV3_LIB_IMGCODECS
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
help
Include opencv_videoio (media i/o) module into the OpenCV build.
Include opencv_videoio (media i/o) module into the OpenCV
build.
config BR2_PACKAGE_OPENCV3_LIB_VIDEO
bool "video"
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
help
Include opencv_video (video analysis) module into the OpenCV build.
Include opencv_video (video analysis) module into the OpenCV
build.
config BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB
bool "videostab"
@@ -229,8 +236,8 @@ config BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB
select BR2_PACKAGE_OPENCV3_LIB_PHOTO
select BR2_PACKAGE_OPENCV3_LIB_VIDEO
help
Include opencv_videostab (video stabilization) module into the OpenCV
build.
Include opencv_videostab (video stabilization) module into
the OpenCV build.
comment "Test sets"
config BR2_PACKAGE_OPENCV3_BUILD_TESTS
@@ -320,16 +327,17 @@ config BR2_PACKAGE_OPENCV3_WITH_V4L
help
Enable Video 4 Linux support.
If the package libv4l is enabled, its support is automatically enabled.
If the package libv4l is enabled, its support is
automatically enabled.
comment "Install options"
config BR2_PACKAGE_OPENCV3_INSTALL_DATA
bool "install extra data"
help
Install various data that is used by cv libraries and/or demo
applications, specifically for haarcascades and lbpcascades
features.
Install various data that is used by cv libraries and/or
demo applications, specifically for haarcascades and
lbpcascades features.
For further information: see OpenCV documentation.

4
bsp/buildroot/package/opencv3/opencv3.hash
View File

@@ -1,2 +1,4 @@
# Locally calculated
sha256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf opencv3-3.1.0.tar.gz
sha256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 opencv3-3.3.0.tar.gz
# License files, locally calculated
sha256 e974db937899a2505f0eb43ece9d2f2eb36e8580ad88785e3ffac0d697ebaf5d LICENSE

29
bsp/buildroot/package/opencv3/opencv3.mk
View File

@@ -4,11 +4,12 @@
#
################################################################################
OPENCV3_VERSION = 3.1.0
OPENCV3_SITE = $(call github,itseez,opencv,$(OPENCV3_VERSION))
OPENCV3_VERSION = 3.3.0
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES
OPENCV3_LICENSE = BSD-3c
OPENCV3_LICENSE = BSD-3-Clause
OPENCV3_LICENSE_FILES = LICENSE
OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
# Uses __atomic_fetch_add_4
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
@@ -97,22 +98,8 @@ OPENCV3_CONF_OPTS += \
#
# * PowerPC support is turned off since its only effect is altering CFLAGS,
# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
# * fma3 and popcnt support is disabled because according to gcc manual [2], it
# is only available on x86_64 haswell, broadwell and knl architecture.
#
# [2] https://gcc.gnu.org/onlinedocs/gcc-5.1.0/gcc/x86-Options.html#x86-Options
OPENCV3_CONF_OPTS += \
-DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \
-DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \
-DENABLE_FMA3=OFF \
-DENABLE_POPCNT=OFF \
-DENABLE_POWERPC=OFF \
-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
-DENABLE_POWERPC=OFF
# Cuda stuff
OPENCV3_CONF_OPTS += \
@@ -179,7 +166,6 @@ OPENCV3_CONF_OPTS += \
-DWITH_CSTRIPES=OFF \
-DWITH_DSHOW=OFF \
-DWITH_MSMF=OFF \
-DWITH_PTHREADS_PF=OFF \
-DWITH_VFW=OFF \
-DWITH_VIDEOINPUT=OFF \
-DWITH_WIN32UI=OFF
@@ -206,6 +192,7 @@ OPENCV3_CONF_OPTS += \
-DWITH_EIGEN=OFF \
-DWITH_GDAL=OFF \
-DWITH_GPHOTO2=OFF \
-DWITH_LAPACK=OFF \
-DWITH_MATLAB=OFF \
-DWITH_OPENCL=OFF \
-DWITH_OPENCL_SVM=OFF \
@@ -321,7 +308,7 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
OPENCV3_CONF_OPTS += \
-DBUILD_opencv_python2=ON \
-DBUILD_opencv_python3=OFF \
-DPYTHON2_EXECUTABLE=$(HOST_DIR)/usr/bin/python2 \
-DPYTHON2_EXECUTABLE=$(HOST_DIR)/bin/python2 \
-DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \
-DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \
-DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \
@@ -332,7 +319,7 @@ else
OPENCV3_CONF_OPTS += \
-DBUILD_opencv_python2=OFF \
-DBUILD_opencv_python3=ON \
-DPYTHON3_EXECUTABLE=$(HOST_DIR)/usr/bin/python3 \
-DPYTHON3_EXECUTABLE=$(HOST_DIR)/bin/python3 \
-DPYTHON3_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m \
-DPYTHON3_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON3_VERSION_MAJOR)m.so \
-DPYTHON3_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \