jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: supports only the real OpenSSL, not LibreSSL

Browse Source 
ffmpeg will not build with LibreSSL without patches, so let's support
only OpenSSL.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-10-21 18:46:40 +02:00
parent 42b5fb0571
commit 803c49891f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/ffmpeg/ffmpeg.mk
View File

@ -208,13 +208,13 @@ FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
FFMPEG_DEPENDENCIES += gnutls FFMPEG_DEPENDENCIES += gnutls
else else
FFMPEG_CONF_OPTS += --disable-gnutls FFMPEG_CONF_OPTS += --disable-gnutls
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
# openssl isn't license compatible with GPL # openssl isn't license compatible with GPL
ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
FFMPEG_CONF_OPTS += --disable-openssl FFMPEG_CONF_OPTS += --disable-openssl
else else
FFMPEG_CONF_OPTS += --enable-openssl FFMPEG_CONF_OPTS += --enable-openssl
FFMPEG_DEPENDENCIES += openssl FFMPEG_DEPENDENCIES += libopenssl
endif endif
else else
FFMPEG_CONF_OPTS += --disable-openssl FFMPEG_CONF_OPTS += --disable-openssl