[Buildroot] [PATCH 3/4 v2] Revert "package/gstreamer1/gst1-plugins-bad: disable opencv plugin with opencv-3"
Samuel Martin
s.martin49 at gmail.com
Sun Aug 9 18:36:41 UTC 2015
Yann,
On Sun, Aug 9, 2015 at 6:14 PM, Yann E. MORIN <yann.morin.1998 at free.fr> wrote:
> From: Samuel Martin <s.martin49 at gmail.com>
>
> This reverts commit 5e238a87eacf2a0c62736c4123961651afb1ba87.
>
> Also update the dependencies.
>
> Cc: Jonathan Ben Avraham <yba at tkos.co.il>
> Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
> [yann.morin.1998 at free.fr: fix dependencies at the same time]
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> ---
> package/gstreamer1/gst1-plugins-bad/Config.in | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
> index bc99527..494a282 100644
> --- a/package/gstreamer1/gst1-plugins-bad/Config.in
> +++ b/package/gstreamer1/gst1-plugins-bad/Config.in
> @@ -557,9 +557,22 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON
>
> config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
> bool "opencv"
> - depends on BR2_INSTALL_LIBSTDCPP
> - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
> - depends on BROKEN # gst1-plugin-opencv does not (yet) support opencv >=3.x
> + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # opencv
> + depends on BR2_INSTALL_LIBSTDCPP # opencv
> + depends on BR2_USE_WCHAR # opencv
> + select BR2_PACKAGE_OPENCV
> + # Remove the following opencv modules when gstreamer fixes the
> + # problem of including the old "cv.h" header
> + # bug: https://bugzilla.gnome.org/show_bug.cgi?id=725163
> + select BR2_PACKAGE_OPENCV_LIB_CALIB3D
> + select BR2_PACKAGE_OPENCV_LIB_CONTRIB
> + select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
> + select BR2_PACKAGE_OPENCV_LIB_FLANN
> + select BR2_PACKAGE_OPENCV_LIB_IMGPROC
> + select BR2_PACKAGE_OPENCV_LIB_LEGACY
> + select BR2_PACKAGE_OPENCV_LIB_ML
> + select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
> + select BR2_PACKAGE_OPENCV_LIB_VIDEO
> help
> GStreamer OpenCV Plugins
How do you ensure that gst1-plugins-bad cannot select opencv when
opencv3 is already selected?
Regards,
--
Samuel
More information about the buildroot
mailing list