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

package/vlc: update opencv support 



vlc supports both opencv-2.4 and opencv-3, so adjust the vlc package to
reflect this.

Cc: Jonathan Ben Avraham <yba@tkos.co.il>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent ebdd8f87

package/vlc/Config.in

+12 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ config BR2_PACKAGE_VLC 
	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

	select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS

	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC if BR2_PACKAGE_OPENCV3

	select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT if BR2_PACKAGE_OPENCV3

	select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV

	select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3

	help

	  VLC is a free and open source cross-platform multimedia player

	  and framework that plays most multimedia files as well as DVD,
@@ -20,6 +20,16 @@ config BR2_PACKAGE_VLC 


	  http://www.videolan.org/vlc/



config BR2_PACKAGE_VLC_OPENCV_BACKEND

	bool

	select BR2_PACKAGE_OPENCV_LIB_IMGPROC

	select BR2_PACKAGE_OPENCV_LIB_OBJDETECT



config BR2_PACKAGE_VLC_OPENCV3_BACKEND

	bool

	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC

	select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT



comment "vlc needs a uclibc snapshot, uclibc-ng or (e)glibc toolchain w/ C++, wchar, threads, headers >= 3.7"

	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) \

		|| !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \

package/vlc/vlc.mk

+5 −1
Original line number Diff line number Diff line
@@ -153,9 +153,13 @@ else 
VLC_CONF_OPTS += --disable-gles2

endif



ifeq ($(BR2_PACKAGE_OPENCV3),y)

ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y)

VLC_CONF_OPTS += --enable-opencv

ifeq ($(BR2_PACKAGE_OPENCV),y)

VLC_DEPENDENCIES += opencv

else

VLC_DEPENDENCIES += opencv3

endif

else

VLC_CONF_OPTS += --disable-opencv

endif