mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
opencv: since 2.4.8 bump, requires NPTL
The core module of OpenCV is now using the pthread_spin_*() API, which is only available in the 'linuxthreads' and 'NPTL' thread implementations, but not in the 'linuxthreads.old' implementation. Therefore, this commit adds a dependency on OpenCV to NPTL threads. Fixes: http://autobuild.buildroot.org/results/75d/75db3827ec4be8a3805508a22b8b6a4d1a3b9ce3/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
153990dfd8
commit
26043fdbf0
@ -425,6 +425,7 @@ 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_INSTALL_LIBSTDCPP
|
||||||
|
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||||
select BR2_PACKAGE_OPENCV
|
select BR2_PACKAGE_OPENCV
|
||||||
# Remove the following opencv modules when gstreamer fixes the
|
# Remove the following opencv modules when gstreamer fixes the
|
||||||
# problem of including the old "cv.h" header
|
# problem of including the old "cv.h" header
|
||||||
@ -441,8 +442,8 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
|
|||||||
help
|
help
|
||||||
GStreamer OpenCV Plugins
|
GStreamer OpenCV Plugins
|
||||||
|
|
||||||
comment "opencv plugin needs a toolchain w/ C++"
|
comment "opencv plugin needs a toolchain w/ C++, NPTL"
|
||||||
depends on !BR2_INSTALL_LIBSTDCPP
|
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||||
|
|
||||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
|
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
|
||||||
bool "opus"
|
bool "opus"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
menuconfig BR2_PACKAGE_OPENCV
|
menuconfig BR2_PACKAGE_OPENCV
|
||||||
bool "opencv"
|
bool "opencv"
|
||||||
select BR2_PACKAGE_ZLIB
|
select BR2_PACKAGE_ZLIB
|
||||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||||
depends on BR2_INSTALL_LIBSTDCPP
|
depends on BR2_INSTALL_LIBSTDCPP
|
||||||
depends on BR2_USE_WCHAR
|
depends on BR2_USE_WCHAR
|
||||||
help
|
help
|
||||||
@ -228,5 +228,5 @@ config BR2_PACKAGE_OPENCV_INSTALL_DATA
|
|||||||
|
|
||||||
endif # BR2_PACKAGE_OPENCV
|
endif # BR2_PACKAGE_OPENCV
|
||||||
|
|
||||||
comment "opencv needs a toolchain w/ C++, threads, wchar"
|
comment "opencv needs a toolchain w/ C++, NPTL, wchar"
|
||||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
|
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user