[pkgsrc/trunk]: pkgsrc/multimedia ffmpeg[234]: Add an ssl optional group to o...

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbf09317fa04
branches:  trunk
changeset: 313768:dbf09317fa04
user:      leot <leot%pkgsrc.org@localhost>
date:      Tue Oct 09 11:04:10 2018 +0000

description:
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:

 multimedia/ffmpeg2/options.mk |  10 +++++++---
 multimedia/ffmpeg3/options.mk |  10 +++++++---
 multimedia/ffmpeg4/options.mk |   7 +++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r ec1ee2198934 -r dbf09317fa04 multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk     Mon Oct 08 20:58:56 2018 +0000
+++ b/multimedia/ffmpeg2/options.mk     Tue Oct 09 11:04:10 2018 +0000
@@ -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
diff -r ec1ee2198934 -r dbf09317fa04 multimedia/ffmpeg3/options.mk
--- a/multimedia/ffmpeg3/options.mk     Mon Oct 08 20:58:56 2018 +0000
+++ b/multimedia/ffmpeg3/options.mk     Tue Oct 09 11:04:10 2018 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: options.mk,v 1.14 2018/09/29 14:28:24 tnn Exp $
+# $NetBSD: options.mk,v 1.15 2018/10/09 11:04:10 leot Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg3
-PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \
-                       lame libvpx opencore-amr openssl opus rpi rtmp \
+
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+
+PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype \
+                       lame libvpx opencore-amr opus rpi rtmp \
                        tesseract theora vorbis x11 x264 x265 xcb xvid
 PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
                        theora vorbis x11 x264 xvid
diff -r ec1ee2198934 -r dbf09317fa04 multimedia/ffmpeg4/options.mk
--- a/multimedia/ffmpeg4/options.mk     Mon Oct 08 20:58:56 2018 +0000
+++ b/multimedia/ffmpeg4/options.mk     Tue Oct 09 11:04:10 2018 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2018/10/05 14:23:44 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2018/10/09 11:04:10 leot Exp $
 
 # Global and legacy options
 
+PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
+PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg4
 PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
-                       gnutls lame libvpx opencore-amr openssl opus rpi \
+                       gnutls lame libvpx opencore-amr opus rpi \
                        rtmp tesseract theora vorbis x11 x264 x265 xcb xvid
 PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig libvpx \
                        openssl theora vorbis x11 x264 xvid