diff options
| author | Treeve Jelbert | 2019-05-08 21:38:30 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2019-05-09 09:42:14 +0200 |
| commit | a4104122567a34b99c0b225f7a667687a0f0dc82 (patch) | |
| tree | 61f53c085328556df3993a37e7cc598dccc0d3e4 /video | |
| parent | d07c951f1849944dcc20af0dcdcf7a8ad1af2ade (diff) | |
ffmpeg - clean and simmplify SSL dependency
Diffstat (limited to 'video')
| -rwxr-xr-x | video/ffmpeg/CONFIGURE | 7 | ||||
| -rwxr-xr-x | video/ffmpeg/DEPENDS | 8 | ||||
| -rw-r--r-- | video/ffmpeg/HISTORY | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/video/ffmpeg/CONFIGURE b/video/ffmpeg/CONFIGURE index 016ddf7b8b..8136047e56 100755 --- a/video/ffmpeg/CONFIGURE +++ b/video/ffmpeg/CONFIGURE @@ -1,5 +1,7 @@ +list_remove FFMPEG_HTTPS openssl +list_remove FFMPEG_HTTPS openssl-1.1 +list_remove FFMPEG_HTTPS libressl . $GRIMOIRE/config_query_multi.function && - default_configure && # backporting legacy options @@ -30,5 +32,6 @@ config_query_multi FFMPEG_PROGRAMS "Which command line programs would you like t $FFMPEG_PROGRAM_LIST \ all \ none && + config_query_list FFMPEG_HTTPS "how to support https"\ - libressl gnutls openssl openssl-1.1 none + gnutls SSL none diff --git a/video/ffmpeg/DEPENDS b/video/ffmpeg/DEPENDS index 182e734fca..3e4a63bcef 100755 --- a/video/ffmpeg/DEPENDS +++ b/video/ffmpeg/DEPENDS @@ -62,13 +62,9 @@ optional_depends frei0r-plugins \ if [[ $FFMPEG_RELEASE == stable ]]; then case $FFMPEG_HTTPS in - 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}" ;; - openssl-1.1) depends openssl-1.1 "--enable-nonfree --enable-openssl" && - message "OpenSSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;; + SSL) depends SSL "--enable-nonfree --enable-openssl" && + message "Open/Libre SSL ${PROBLEM_COLOR}nonfree${DEFAULT_COLOR}" ;; esac && optional_depends fontconfig \ diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY index 740add7797..715b1e6080 100644 --- a/video/ffmpeg/HISTORY +++ b/video/ffmpeg/HISTORY @@ -1,3 +1,6 @@ +2019-05-08 Treeve Jelbert <treeve@sourcemage.org> + * DEPENDS CONFIGURE: clean and simmplify SSL dependency + 2019-04-04 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 4.1.3 * DEPENDS, CONFIGURE: support openssl-1.1 |