diff options
Diffstat (limited to 'package/opencv')
| -rw-r--r-- | package/opencv/Config.in | 8 | ||||
| -rw-r--r-- | package/opencv/opencv.mk | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 3f5051ef12..24f540efbd 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -205,16 +205,10 @@ config BR2_PACKAGE_OPENCV_WITH_TIFF config BR2_PACKAGE_OPENCV_WITH_V4L bool "v4l support" - depends on BR2_LARGEFILE - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # libv4l fork - select BR2_PACKAGE_LIBV4L help Enable Video 4 Linux support. -comment "v4l support needs a toolchain w/ largefile, threads" - depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU + If the package libv4l is enabled, its support is automatically enabled. comment "Install options" diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 1341d3208a..8c2de7988e 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -220,8 +220,10 @@ OPENCV_CONF_OPT += -DWITH_TIFF=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_V4L),y) -OPENCV_CONF_OPT += -DWITH_V4L=ON -DWITH_LIBV4L=ON -OPENCV_DEPENDENCIES += libv4l +OPENCV_CONF_OPT += \ + -DWITH_V4L=ON \ + -DWITH_LIBV4L=$(if $(BR2_PACKAGE_LIBV4L),ON,OFF) +OPENCV_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBV4L),libv4l) else OPENCV_CONF_OPT += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif |
