CVS commit: pkgsrc/multimedia/ffmpeg4

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Apr 19 18:25:07 UTC 2020

Modified Files:
        pkgsrc/multimedia/ffmpeg4: Makefile options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.10 -r1.11 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/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.24 pkgsrc/multimedia/ffmpeg4/Makefile:1.25
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.24     Fri Mar 20 21:19:54 2020
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Sun Apr 19 18:25:07 2020
@@ -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)

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.10 pkgsrc/multimedia/ffmpeg4/options.mk:1.11
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.10   Tue Jun 18 14:41:09 2019
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Sun Apr 19 18:25:07 2020
@@ -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+=     --enable-gnutls
 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