diff options
Diffstat (limited to 'package/opencv')
| -rw-r--r-- | package/opencv/Config.in | 10 | ||||
| -rw-r--r-- | package/opencv/opencv.mk | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index ccde5cb349..b40e1412cf 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -26,12 +26,6 @@ config BR2_PACKAGE_OPENCV_LIB_CONTRIB help Include opencv_contrib module into the OpenCV build. -config BR2_PACKAGE_OPENCV_LIB_CORE - bool "core" - default y - help - Include opencv_core module into the OpenCV build. - config BR2_PACKAGE_OPENCV_LIB_FEATURES2D bool "features2d" default y @@ -140,6 +134,7 @@ comment "ffmpeg support needs a toolchain w/ largefile, IPv6" config BR2_PACKAGE_OPENCV_WITH_GSTREAMER bool "gstreamer support" + depends on BR2_USE_MMU # gstreamer -> libglib2 depends on BR2_USE_WCHAR # gstreamer -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 select BR2_PACKAGE_GSTREAMER @@ -147,6 +142,7 @@ config BR2_PACKAGE_OPENCV_WITH_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP comment "gstreamer support needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_OPENCV_WITH_GTK @@ -155,6 +151,7 @@ config BR2_PACKAGE_OPENCV_WITH_GTK depends on BR2_USE_WCHAR # libgtk2 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # libgtk2 -> glib2 select BR2_PACKAGE_LIBGTK2 config BR2_PACKAGE_OPENCV_WITH_JPEG @@ -173,6 +170,7 @@ config BR2_PACKAGE_OPENCV_WITH_QT bool "qt backend support" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_avr32 # qt + depends on BR2_USE_MMU # qt select BR2_PACKAGE_QT select BR2_PACKAGE_QT_STL default y diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 732bc0cc55..42f9b0a51f 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -34,7 +34,7 @@ OPENCV_CONF_OPT += \ -DBUILD_opencv_androidcamera=OFF \ -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \ -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \ - -DBUILD_opencv_core=$(if $(BR2_PACKAGE_OPENCV_LIB_CORE),ON,OFF) \ + -DBUILD_opencv_core=ON \ -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \ -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \ -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \ |
