diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2015-08-24 14:47:12 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-25 11:57:36 +0200 |
| commit | 644b856e4ab51606528c1305ade811f52fa3bec4 (patch) | |
| tree | 8bc6a1e60c4b1ae78975e8fe7eac2b5634867e92 | |
| parent | ebdd8f87c6317a001bf83cc78393281e34788a17 (diff) | |
| download | buildroot-644b856e4ab51606528c1305ade811f52fa3bec4.tar.gz buildroot-644b856e4ab51606528c1305ade811f52fa3bec4.zip | |
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: 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>
| -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 |
