diff options
| author | leot <leot@pkgsrc.org> | 2018-10-09 11:04:10 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-10-09 11:04:10 +0000 |
| commit | ebb18655d359218569ab4771b5c75481c37e1947 (patch) | |
| tree | ee3f6cdc261ced00aeccd06add0a868e1e64ccf2 /multimedia/ffmpeg2 | |
| parent | 2501c8a3ce4548e4ed084b83a11919b8bb88fc9c (diff) | |
| download | pkgsrc-ebb18655d359218569ab4771b5c75481c37e1947.tar.gz | |
ffmpeg[234]: Add an ssl optional group to only choice gnutls or openssl option
At least multimedia/ffmpeg4 does not support to be built with both `gnutls' and
`openssl'. Introduce an `ssl' optional group in order to select only `gnutls'
or `openssl' option.
Noticed by John D. Baker on pkgsrc-users@:
<https://mail-index.NetBSD.org/pkgsrc-users/2018/09/25/msg027482.html>
Thanks to John for spotting that and <gdt> for review!
Diffstat (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/options.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk index d821f33c01c..9a2d416de57 100644 --- a/multimedia/ffmpeg2/options.mk +++ b/multimedia/ffmpeg2/options.mk @@ -1,10 +1,14 @@ -# $NetBSD: options.mk,v 1.13 2017/09/20 08:21:17 adam Exp $ +# $NetBSD: options.mk,v 1.14 2018/10/09 11:04:10 leot Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2 -PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype gnutls lame \ - libvpx opencore-amr openssl rtmp theora vorbis x11 x264 \ + +PKG_OPTIONS_OPTIONAL_GROUPS= ssl +PKG_OPTIONS_GROUP.ssl= gnutls openssl + +PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype lame \ + libvpx opencore-amr rtmp theora vorbis x11 x264 \ x265 xcb xvid PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \ theora vorbis x11 x264 xvid |