Sun Apr 19 18:25:07 2020 UTC ()
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


(nia)
diff -r1.24 -r1.25 pkgsrc/multimedia/ffmpeg4/Makefile
diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg4/options.mk
cvs diff -r1.24 -r1.25 pkgsrc/multimedia/ffmpeg4/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/Makefile 2020/03/20 21:19:54 1.24
+++ pkgsrc/multimedia/ffmpeg4/Makefile 2020/04/19 18:25:07 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.24 2020/03/20 21:19:54 nia Exp $ 1# $NetBSD: Makefile,v 1.25 2020/04/19 18:25:07 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/}
4PKGREVISION= 4 4PKGREVISION= 5
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software (v4.x) 7COMMENT= Decoding, encoding and streaming software (v4.x)
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10CONFIGURE_ARGS+= --enable-avresample 10CONFIGURE_ARGS+= --enable-avresample
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12CONFIGURE_ARGS+= --enable-rpath 12CONFIGURE_ARGS+= --enable-rpath
13CONFIGURE_ARGS+= --disable-ffplay 13CONFIGURE_ARGS+= --disable-ffplay
14 14
15INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4 15INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg4/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/options.mk 2019/06/18 14:41:09 1.10
+++ pkgsrc/multimedia/ffmpeg4/options.mk 2020/04/19 18:25:07 1.11
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: options.mk,v 1.10 2019/06/18 14:41:09 nia Exp $ 1# $NetBSD: options.mk,v 1.11 2020/04/19 18:25:07 nia Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_OPTIONAL_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
6PKG_OPTIONS_GROUP.ssl= gnutls openssl 6PKG_OPTIONS_GROUP.ssl= gnutls mbedtls openssl
7 7
8PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4 8PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4
9PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \ 9PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype \
10 gnutls lame libvpx opencore-amr opus pulseaudio rpi \ 10 gnutls lame libvpx opencore-amr opus pulseaudio rpi \
11 rtmp tesseract theora vorbis x11 x264 x265 xvid 11 rtmp tesseract theora vorbis x11 x264 x265 xvid
12PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig libvpx \ 12PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig gnutls \
13 openssl theora vorbis x11 x264 xvid 13 libvpx opus theora vorbis x11 x264 x265 xvid
14 14
15PKG_OPTIONS_LEGACY_OPTS+= xcb:x11 15PKG_OPTIONS_LEGACY_OPTS+= xcb:x11
16 16
17PLIST_VARS+= doc 17PLIST_VARS+= doc
18 18
19# Add VDPAU if it is available 19# Add VDPAU if it is available
20.include "../../multimedia/libvdpau/available.mk" 20.include "../../multimedia/libvdpau/available.mk"
21.if ${VDPAU_AVAILABLE} == "yes" 21.if ${VDPAU_AVAILABLE} == "yes"
22PKG_SUPPORTED_OPTIONS+= vdpau 22PKG_SUPPORTED_OPTIONS+= vdpau
23PKG_SUGGESTED_OPTIONS+= vdpau 23PKG_SUGGESTED_OPTIONS+= vdpau
24.endif 24.endif
25 25
26# Add VAAPI if it is available 26# Add VAAPI if it is available
@@ -82,26 +82,34 @@ NO_BIN_ON_FTP= ${RESTRICTED} @@ -82,26 +82,34 @@ NO_BIN_ON_FTP= ${RESTRICTED}
82CONFIGURE_ARGS+= --enable-libfdk_aac 82CONFIGURE_ARGS+= --enable-libfdk_aac
83CONFIGURE_ARGS+= --enable-nonfree 83CONFIGURE_ARGS+= --enable-nonfree
84.include "../../audio/fdk-aac/buildlink3.mk" 84.include "../../audio/fdk-aac/buildlink3.mk"
85.endif 85.endif
86 86
87# GnuTLS support 87# GnuTLS support
88.if !empty(PKG_OPTIONS:Mgnutls) 88.if !empty(PKG_OPTIONS:Mgnutls)
89CONFIGURE_ARGS+= --enable-gnutls 89CONFIGURE_ARGS+= --enable-gnutls
90.include "../../security/gnutls/buildlink3.mk" 90.include "../../security/gnutls/buildlink3.mk"
91.else 91.else
92CONFIGURE_ARGS+= --disable-gnutls 92CONFIGURE_ARGS+= --disable-gnutls
93.endif 93.endif
94 94
 95# mbedTLS support
 96.if !empty(PKG_OPTIONS:Mmbedtls)
 97CONFIGURE_ARGS+= --enable-mbedtls
 98.include "../../security/mbedtls/buildlink3.mk"
 99.else
 100CONFIGURE_ARGS+= --disable-mbedtls
 101.endif
 102
95# opencore-amr option 103# opencore-amr option
96.if !empty(PKG_OPTIONS:Mopencore-amr) 104.if !empty(PKG_OPTIONS:Mopencore-amr)
97CONFIGURE_ARGS+= --enable-libopencore-amrnb 105CONFIGURE_ARGS+= --enable-libopencore-amrnb
98CONFIGURE_ARGS+= --enable-libopencore-amrwb 106CONFIGURE_ARGS+= --enable-libopencore-amrwb
99# "The OpenCORE external libraries are under the Apache License 107# "The OpenCORE external libraries are under the Apache License
100# 2.0. That license is incompatible with the LGPL v2.1 and the GPL 108# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
101# v2, but not with version 3 of those licenses. So to combine the 109# v2, but not with version 3 of those licenses. So to combine the
102# OpenCORE libraries with FFmpeg, the license version needs to be 110# OpenCORE libraries with FFmpeg, the license version needs to be
103# upgraded by passing --enable-version3 to configure." 111# upgraded by passing --enable-version3 to configure."
104CONFIGURE_ARGS+= --enable-version3 112CONFIGURE_ARGS+= --enable-version3
105ADDITIONAL_LICENSE+= AND gnu-lgpl-v3 113ADDITIONAL_LICENSE+= AND gnu-lgpl-v3
106.include "../../audio/opencore-amr/buildlink3.mk" 114.include "../../audio/opencore-amr/buildlink3.mk"
107.else 115.else