jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package/gstreamer1/gst1-plugins-bad: disable opencv plugin with opencv-3"

Browse Source 
This (partially) reverts commit 5e238a87eacf2a0c62736c4123961651afb1ba87.

The dependency is changed from a 'select' to a 'depends on' to avoid a
circular dependency caused by the introduction of OpenCV-3. This means
we can also drop the threads and C++ dependencies, since they are now
inherited via the depends on OpenCV.

Cc: Jonathan Ben Avraham <yba@tkos.co.il>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
[yann.morin.1998@free.fr: fix dependencies]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Samuel Martin 2015-08-24 14:47:11 +02:00 committed by Thomas Petazzoni
parent ac57d05076
commit ebdd8f87c6
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/gstreamer1/gst1-plugins-bad/Config.in
View File

@ -557,14 +557,24 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
bool "opencv" bool "opencv"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_OPENCV
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Remove the following opencv modules when gstreamer fixes the
depends on BROKEN # gst1-plugin-opencv does not (yet) support opencv >=3.x # 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 help
GStreamer OpenCV Plugins GStreamer OpenCV Plugins
comment "opencv plugin needs a toolchain w/ C++, NPTL" comment "opencv plugin needs OpenCV-2.4"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_PACKAGE_OPENCV
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
bool "opus" bool "opus"