From b83d57211be83314374cb09adb25b8f2d37ff3df Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Feb 2014 23:14:40 +0100 Subject: [PATCH] Revert "opencv: cleanup depends and comments" This reverts commit 5f7cbb264ec21f75320ad8518d27f4c605c825f8. Buildroot policy is to keep the dependencies / comments for sub options in case the package in the future no longer has those dependencies. See http://lists.busybox.net/pipermail/buildroot/2014-February/088523.html for details. Signed-off-by: Peter Korsgaard --- package/opencv/Config.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index dfdd93a4de..ccde5cb349 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -140,13 +140,20 @@ comment "ffmpeg support needs a toolchain w/ largefile, IPv6" config BR2_PACKAGE_OPENCV_WITH_GSTREAMER bool "gstreamer support" + depends on BR2_USE_WCHAR # gstreamer -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 select BR2_PACKAGE_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP +comment "gstreamer support needs a toolchain w/ wchar, threads" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_WCHAR # libgtk2 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBGTK2 @@ -181,12 +188,13 @@ 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 select BR2_PACKAGE_LIBV4L help Enable Video 4 Linux support. -comment "v4l support needs a toolchain w/ largefile" - depends on !BR2_LARGEFILE +comment "v4l support needs a toolchain w/ largefile, threads" + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS comment "Install options" -- 2.30.2