[Buildroot] [PATCH v3 1/8] opencv: rework V4L/libv4l support
Samuel Martin
s.martin49 at gmail.com
Sun Aug 31 20:09:03 UTC 2014
Starting with the 2.4.7 release, for V4L support, OpenCV does not
requires a libv4l dependency for its V4L support.
So, it now provides 2 distincts knobs for this: WITH_V4L and a new
one: WITH_LIBV4L.
This patch takes advantage of this new knob and libv4l support is
now automatically enabled only if the libv4l package is enabled.
In OpenCV, the logic behind this is:
- using libv4l if available,
- otherwise, use v4l2 or v4l API from the kernel if available.
Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
---
chnages v2 -> v3:
- rebase
- remove comments about libv4l use (Yann)
changes v1 -> v2:
- rebase
- extend commit message
---
package/opencv/Config.in | 8 +-------
package/opencv/opencv.mk | 10 +++++++---
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 3f5051e..24f540e 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 1341d32..2b649ff 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -220,10 +220,14 @@ 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
+OPENCV_CONF_OPT += \
+ -DWITH_V4L=OFF \
+ -DWITH_LIBV4L=OFF
endif
# Installation hooks:
--
2.1.0
More information about the buildroot
mailing list