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

Bump Buildroot Version to buildroot 2019_02_6

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-10-25 11:46:00 +02:00
parent e07322a5a8
commit c1075f68da
549 changed files with 6692 additions and 4165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,11 +157,15 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON
bool "python"
depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
select BR2_PACKAGE_PYTHON_NUMPY
help
Include opencv_python module into the OpenCV build. No
python example is installed.
comment "python support needs glibc or musl"
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
config BR2_PACKAGE_OPENCV3_LIB_SHAPE
bool "shape"
# opencv_core dependency is already enabled

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

@@ -30,7 +30,8 @@ OPENCV3_CONF_OPTS += \
-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),ON,OFF) \
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_TESTS),ON,OFF) \
-DBUILD_WITH_DEBUG_INFO=OFF \
-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF \
-DOPENCV_ENABLE_PKG_CONFIG=ON
ifeq ($(BR2_PACKAGE_OPENCV3_BUILD_TESTS)$(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),)
OPENCV3_CONF_OPTS += -DINSTALL_TEST=OFF
@@ -221,7 +222,7 @@ OPENCV3_CONF_OPTS += \
-DWITH_WEBP=OFF \
-DWITH_XINE=OFF
OPENCV3_DEPENDENCIES += zlib
OPENCV3_DEPENDENCIES += host-pkgconf zlib
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),y)
OPENCV3_CONF_OPTS += -DWITH_FFMPEG=ON