Commit fc71d527 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

package/opencv: add gstreamer-1.x support 



Starting with the 2.4.10 release, OpenCV supports both Gstreamer-0.10
and Gstreamer-1, but only one can be enabled at the same time (OpenCV
chooses Gstreamer-1 over Gstreamer-0.10 when both are available).

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 97daf3a0

package/opencv/Config.in

+15 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG 


choice

	prompt "gstreamer support"

	help

	  OpenCV prefers gstreamer-1 over gstreamer-0.10.



config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER

	bool "none"
@@ -192,6 +194,19 @@ comment "gstreamer-0.10 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_GSTREAMER1

	bool "gstreamer-1.x"

	depends on BR2_USE_MMU # gstreamer1 -> libglib2

	depends on BR2_USE_WCHAR # gstreamer1 -> libglib2

	depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2

	select BR2_PACKAGE_GSTREAMER1

	select BR2_PACKAGE_GST1_PLUGINS_BASE

	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP



comment "gstreamer-1.x support needs a toolchain w/ wchar, threads"

	depends on BR2_USE_MMU

	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS



endchoice



config BR2_PACKAGE_OPENCV_WITH_GTK

package/opencv/opencv.mk

+9 −2
Original line number Diff line number Diff line
@@ -223,10 +223,17 @@ OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF 
endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y)

OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -DWITH_GSTREAMER_0_10=ON

OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON

OPENCV_DEPENDENCIES += gstreamer gst-plugins-base

else

OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=OFF

OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF

endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y)

OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON

OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base

else

OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF

endif



ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)