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

package/vlc: update opencv support

Browse Source 
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: Samuel Martin <s.martin49@gmail.com>
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:12 +02:00 committed by Thomas Petazzoni
parent ebdd8f87c6
commit 644b856e4a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/vlc/Config.in
View File

@ -11,8 +11,8 @@ config BR2_PACKAGE_VLC
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV
select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT if BR2_PACKAGE_OPENCV3 select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3
help help
VLC is a free and open source cross-platform multimedia player VLC is a free and open source cross-platform multimedia player
and framework that plays most multimedia files as well as DVD, and framework that plays most multimedia files as well as DVD,
@ -20,6 +20,16 @@ config BR2_PACKAGE_VLC
http://www.videolan.org/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" 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) \ depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) \
|| !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \

6
package/vlc/vlc.mk
View File

@ -153,9 +153,13 @@ else
VLC_CONF_OPTS += --disable-gles2 VLC_CONF_OPTS += --disable-gles2
endif endif
ifeq ($(BR2_PACKAGE_OPENCV3),y) ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y)
VLC_CONF_OPTS += --enable-opencv VLC_CONF_OPTS += --enable-opencv
ifeq ($(BR2_PACKAGE_OPENCV),y)
VLC_DEPENDENCIES += opencv
else
VLC_DEPENDENCIES += opencv3 VLC_DEPENDENCIES += opencv3
endif
else else
VLC_CONF_OPTS += --disable-opencv VLC_CONF_OPTS += --disable-opencv
endif endif