pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: ffmpeg* openssl/gnutls options?



Hello John, Greg and pkgsrc-users@,

Greg Troxel writes:
> 
> "John D. Baker" <jdbaker%mylinuxisp.com@localhost> writes:
>
> > In ffmpeg* there are options for either openssl or gnutls.  It appears,
> > however, that one may enable both at the same time (if "gnutls" is
> > enabled, both "gnutls" and "openssl" appear in the output of 'make
> > show-options').
> >
> > [snip]
> >
> > Thus, if one wishes to use "gnutls" on ffmpeg4 one must also explictly
> > disable OpenSSL with "-openssl".
> >
> > I know there are packages with "radio-button" type options where the
> > enabling of one option implies the disabling of others (OPTIONS_GROUP?)
> > Perhaps ffmpeg4 could be changed to have this arrangement for the
> > selection of "openssl" (default) vs "gnutls"?
> >
> > Although the earlier ffmpeg* packages don't complain, is having both
> > openssl and gnutls enabled simultaneously really appropriate for them?
>
> Probably PKG_OPTIONS_OPTIONAL_GROUPS is appopriate, assuming it's valid
> to compile without either.
>
> However, this is not a change I would make during freeze; the problem is
> minor, only affects non-standard options use, and is easy to work
> around.

As pointed out by Greg PKG_OPTIONS_OPTIONAL_GROUPS should do the
trick and possible patch is attached in this email... ...but I
agree with Greg, there is probably no hurry for that and I propose
to commit it after the freeze. :)


Thank you!
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>

Index: ffmpeg2/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg2/options.mk,v
retrieving revision 1.13
diff -u -p -r1.13 options.mk
--- ffmpeg2/options.mk	20 Sep 2017 08:21:17 -0000	1.13
+++ ffmpeg2/options.mk	25 Sep 2018 16:11:48 -0000
@@ -3,6 +3,10 @@
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg2
+
+PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
+PKG_OPTIONS_GROUP.ssl=		gnutls openssl
+
 PKG_SUPPORTED_OPTIONS=	ass doc faac fdk-aac fontconfig freetype gnutls lame \
 			libvpx opencore-amr openssl rtmp theora vorbis x11 x264 \
 			x265 xcb xvid
Index: ffmpeg3/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg3/options.mk,v
retrieving revision 1.13
diff -u -p -r1.13 options.mk
--- ffmpeg3/options.mk	25 Sep 2018 09:46:09 -0000	1.13
+++ ffmpeg3/options.mk	25 Sep 2018 16:11:48 -0000
@@ -3,6 +3,10 @@
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg3
+
+PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
+PKG_OPTIONS_GROUP.ssl=		gnutls openssl
+
 PKG_SUPPORTED_OPTIONS=	ass bluray doc fdk-aac fontconfig freetype gnutls \
 			lame libvpx opencore-amr openssl opus rpi rtmp \
 			tesseract theora vorbis x11 x264 x265 xcb xvid
Index: ffmpeg4/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg4/options.mk,v
retrieving revision 1.3
diff -u -p -r1.3 options.mk
--- ffmpeg4/options.mk	25 Sep 2018 09:39:56 -0000	1.3
+++ ffmpeg4/options.mk	25 Sep 2018 16:11:48 -0000
@@ -3,6 +3,10 @@
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg4
+
+PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
+PKG_OPTIONS_GROUP.ssl=		gnutls openssl
+
 PKG_SUPPORTED_OPTIONS=	ass bluray doc fdk-aac fontconfig freetype gnutls \
 			lame libvpx opencore-amr openssl opus rpi rtmp \
 			tesseract theora vorbis x11 x264 x265 xcb xvid


Home | Main Index | Thread Index | Old Index