diff options
| author | Florian Franzmann | 2019-04-04 01:12:09 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2019-04-05 18:15:02 +0200 |
| commit | 36616a21a257c9670a5cc9c25d1d6ca4d1146be3 (patch) | |
| tree | fd3c621d59ea937f686d562c8c027252d4bb2140 /video | |
| parent | bf8b22776e8de7815807bb040303a12f85d053d9 (diff) | |
video/ffmpeg: support openssl-1.1
Diffstat (limited to 'video')
| -rwxr-xr-x | video/ffmpeg/CONFIGURE | 2 | ||||
| -rwxr-xr-x | video/ffmpeg/DEPENDS | 9 | ||||
| -rw-r--r-- | video/ffmpeg/HISTORY | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE index a97cf9aa46..016ddf7b8b 100755 --- a/video/ffmpeg/CONFIGURE +++ b/video/ffmpeg/CONFIGURE @@ -31,4 +31,4 @@ config_query_multi FFMPEG_PROGRAMS "Which command line programs would you like t all \ none && config_query_list FFMPEG_HTTPS "how to support https"\ - libressl gnutls openssl none + libressl gnutls openssl openssl-1.1 none diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS index 429dbae734..182e734fca 100755 --- a/video/ffmpeg/DEPENDS +++ b/video/ffmpeg/DEPENDS @@ -62,10 +62,13 @@ optional_depends frei0r-plugins \ if [[ $FFMPEG_RELEASE == stable ]]; then case $FFMPEG_HTTPS in - libressl) depends gnutls "--enable-nonfree --enable-libtls";; - gnutls) depends gnutls "--enable-gnutls";; + libressl) depends gnutls "--enable-nonfree --enable-libtls" && + message "LibreSSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;; + gnutls) depends gnutls "--enable-gnutls" ;; openssl) depends openssl "--enable-nonfree --enable-openssl" && - message "OpenSSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}";; + message "OpenSSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;; + openssl-1.1) depends openssl-1.1 "--enable-nonfree --enable-openssl" && + message "OpenSSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;; esac && optional_depends fontconfig \ diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY index a4f41a4658..740add7797 100644 --- a/video/ffmpeg/HISTORY +++ b/video/ffmpeg/HISTORY @@ -1,5 +1,6 @@ 2019-04-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 4.1.3 + * DEPENDS, CONFIGURE: support openssl-1.1 2019-02-10 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.1.1 |