d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Buildroot 2019.02.8

Browse Source
This commit is contained in:
Pascal Vizeli
2020-01-11 16:41:13 +00:00
parent 1b08cb5d04
commit 0291dfaa64
630 changed files with 8470 additions and 3892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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

7
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
@@ -323,6 +324,7 @@ OPENCV3_CONF_OPTS += \
-DPYTHON2_PACKAGES_PATH=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
-DPYTHON2_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION)
OPENCV3_DEPENDENCIES += python
OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/cv2/config*.py
else
OPENCV3_CONF_OPTS += \
-DBUILD_opencv_python2=OFF \
@@ -334,6 +336,7 @@ OPENCV3_CONF_OPTS += \
-DPYTHON3_PACKAGES_PATH=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
-DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION)
OPENCV3_DEPENDENCIES += python3
OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py
endif
OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV)
OPENCV3_DEPENDENCIES += python-numpy