[Buildroot] [PATCH v3 1/8] opencv: rework V4L/libv4l support
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Sep 14 22:15:33 UTC 2014
Samuel, All,
On 2014-08-31 22:09 +0200, Samuel Martin spake thusly:
> 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
Gratuituous reformating. Besides, the previous line fit in 80-chars, so
there is no real reason to reformat it.
With that fixed:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> endif
>
> # Installation hooks:
> --
> 2.1.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list