diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2015-08-24 14:47:09 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-25 11:51:35 +0200 |
| commit | 3ba8dc3561090c817cdc123d9182b0f0d5d326c0 (patch) | |
| tree | aa5a15b4a97701b4ce2a22d54882bdcc1bc1fa05 /package/vlc | |
| parent | 4803fca4d7ae6deb843c5a7dad28620301188b5e (diff) | |
| download | buildroot-3ba8dc3561090c817cdc123d9182b0f0d5d326c0.tar.gz buildroot-3ba8dc3561090c817cdc123d9182b0f0d5d326c0.zip | |
package: rename opencv -> opencv3
Since there is a couple of API breaks between OpenCV 2.4 and 3.0, two
distinct packages mutually exclusive will be integrated in the package
tree.
So, this change prepares the re-introduction of the OpenCV-2.4 package
by renaming the current opencv package (which provides OpenCV-3.0) to
opencv3.
Reverse dependencies (vlc) is fixed to use the new symbols.
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>
[yann.morin.1998@free.fr:
- fix missed usage in vlc.mk
- don't remove legacy OpenCV symbols
- fix 'endif' comment
- slightly reword commit log (reverse deps)
]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/vlc')
| -rw-r--r-- | package/vlc/Config.in | 4 | ||||
| -rw-r--r-- | package/vlc/vlc.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/vlc/Config.in b/package/vlc/Config.in index 471f4a79da..6679cc9ea9 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_OPENCV_LIB_IMGPROC if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV + select BR2_PACKAGE_OPENCV3_LIB_IMGPROC if BR2_PACKAGE_OPENCV3 + select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT 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, diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index e40863548c..fa74a7bfa2 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -153,9 +153,9 @@ else VLC_CONF_OPTS += --disable-gles2 endif -ifeq ($(BR2_PACKAGE_OPENCV),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) VLC_CONF_OPTS += --enable-opencv -VLC_DEPENDENCIES += opencv +VLC_DEPENDENCIES += opencv3 else VLC_CONF_OPTS += --disable-opencv endif |
