diff options
Diffstat (limited to 'package/vlc')
| -rw-r--r-- | package/vlc/Config.in | 14 | ||||
| -rw-r--r-- | package/vlc/vlc.mk | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/package/vlc/Config.in b/package/vlc/Config.in index 6679cc9ea9..71e4f34742 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -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 \ diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index fa74a7bfa2..6f7fd58a05 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -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 |
