[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg4 ffmpeg4: Various option tweaks.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83182eb881c2
branches:  trunk
changeset: 429398:83182eb881c2
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Apr 19 18:25:07 2020 +0000

description:
ffmpeg4: Various option tweaks.

- Add mbedtls to the ssl group.
- Set the default ssl option to gnutls
  Basically so we don't have to mark binaries as "nonfree" by default
- Enable opus and x265

diffstat:

 multimedia/ffmpeg4/Makefile   |   4 ++--
 multimedia/ffmpeg4/options.mk |  16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r f1d0fbe73a46 -r 83182eb881c2 multimedia/ffmpeg4/Makefile
--- a/multimedia/ffmpeg4/Makefile       Sun Apr 19 13:50:39 2020 +0000
+++ b/multimedia/ffmpeg4/Makefile       Sun Apr 19 18:25:07 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2020/03/20 21:19:54 nia Exp $
+# $NetBSD: Makefile,v 1.25 2020/04/19 18:25:07 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=   4
+PKGREVISION=   5
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v4.x)
diff -r f1d0fbe73a46 -r 83182eb881c2 multimedia/ffmpeg4/options.mk
--- a/multimedia/ffmpeg4/options.mk     Sun Apr 19 13:50:39 2020 +0000
+++ b/multimedia/ffmpeg4/options.mk     Sun Apr 19 18:25:07 2020 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: options.mk,v 1.10 2019/06/18 14:41:09 nia Exp $
+# $NetBSD: options.mk,v 1.11 2020/04/19 18:25:07 nia Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_OPTIONAL_GROUPS=   ssl
-PKG_OPTIONS_GROUP.ssl=         gnutls openssl
+PKG_OPTIONS_GROUP.ssl=         gnutls mbedtls openssl
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg4
 PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
                        gnutls lame libvpx opencore-amr opus pulseaudio rpi \
                        rtmp tesseract theora vorbis x11 x264 x265 xvid
-PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig libvpx \
-                       openssl theora vorbis x11 x264 xvid
+PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig gnutls \
+                       libvpx opus theora vorbis x11 x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=      xcb:x11
 
@@ -92,6 +92,14 @@
 CONFIGURE_ARGS+=       --disable-gnutls
 .endif
 
+# mbedTLS support
+.if !empty(PKG_OPTIONS:Mmbedtls)
+CONFIGURE_ARGS+=       --enable-mbedtls
+.include "../../security/mbedtls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-mbedtls
+.endif
+
 # opencore-amr option
 .if !empty(PKG_OPTIONS:Mopencore-amr)
 CONFIGURE_ARGS+=       --enable-libopencore-amrnb