CVS commit: pkgsrc/multimedia

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Oct  9 11:04:10 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg2: options.mk
        pkgsrc/multimedia/ffmpeg3: options.mk
        pkgsrc/multimedia/ffmpeg4: options.mk

Log Message:
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!


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg4/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.13 pkgsrc/multimedia/ffmpeg2/options.mk:1.14
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.13   Wed Sep 20 08:21:17 2017
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Tue Oct  9 11:04:10 2018
@@ -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

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.14 pkgsrc/multimedia/ffmpeg3/options.mk:1.15
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.14   Sat Sep 29 14:28:24 2018
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Tue Oct  9 11:04:10 2018
@@ -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

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.6 pkgsrc/multimedia/ffmpeg4/options.mk:1.7
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.6    Fri Oct  5 14:23:44 2018
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Tue Oct  9 11:04:10 2018
@@ -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