mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/ffmpeg: add support for libressl

Browse Source 
Ffmpeg builds fine with current libressl 2.7.2.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
2018-04-02 13:58:26 +02:00
committed by Thomas Petazzoni
parent 6d938bcb52
commit 158eab173d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/ffmpeg/ffmpeg.mk
View File

@@ -214,13 +214,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_LIBOPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),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 += libopenssl FFMPEG_DEPENDENCIES += openssl
endif endif
else else
FFMPEG_CONF_OPTS += --disable-openssl FFMPEG_CONF_OPTS += --disable-openssl