aboutsummaryrefslogtreecommitdiff
path: root/package/vlc/vlc.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/vlc/vlc.mk')
-rw-r--r--package/vlc/vlc.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 38d9751690..23dcc5d46f 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -209,13 +209,9 @@ else
VLC_CONF_OPTS += --disable-gles2
endif
-ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y)
+ifeq ($(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
@@ -440,6 +436,9 @@ endif
ifeq ($(BR2_PACKAGE_LIVE555),y)
VLC_CONF_OPTS += --enable-live555
VLC_DEPENDENCIES += live555
+ifneq ($(BR2_PACKAGE_OPENSSL),y)
+VLC_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DNO_OPENSSL"
+endif
else
VLC_CONF_OPTS += --disable-live555
endif