ffmpeg*: Add speex support. Further clarify license mess.

6 files changed, 42 insertions, 28 deletions

diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index 5badd0f2747..fa5ed6bf778 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2020/04/23 17:22:51 nia Exp $
+# $NetBSD: Makefile,v 1.58 2020/04/29 15:11:09 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg2/}
+PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ffmpeg.org/
 COMMENT=	Decoding, encoding and streaming software (v2.x)
diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk
index ed4dd5f1a51..8a46952f26a 100644
--- a/multimedia/ffmpeg2/options.mk
+++ b/multimedia/ffmpeg2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2020/04/23 10:35:40 nia Exp $
+# $NetBSD: options.mk,v 1.19 2020/04/29 15:11:10 nia Exp $
 
 # Global and legacy options
 
@@ -9,9 +9,9 @@ PKG_OPTIONS_GROUP.ssl=		gnutls openssl
 
 PKG_SUPPORTED_OPTIONS=	ass bluray doc faac fdk-aac fontconfig freetype \
 			lame libvpx opencore-amr opus pulseaudio rtmp \
-			theora vorbis x11 x264 x265 xvid
+			speex theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS=	lame ass bluray freetype fontconfig gnutls libvpx \
-			opus theora vorbis x11 x264 x265 xvid
+			opus speex theora vorbis x11 x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=	xcb:x11
 
@@ -164,6 +164,12 @@ CONFIGURE_ARGS+=	--enable-libopus
 .include "../../audio/libopus/buildlink3.mk"
 .endif
 
+# Speex support
+.if !empty(PKG_OPTIONS:Mspeex)
+CONFIGURE_ARGS+=	--enable-libspeex
+.include "../../audio/speex/buildlink3.mk"
+.endif
+
 # XviD support
 .if !empty(PKG_OPTIONS:Mxvid)
 CONFIGURE_ARGS+=	--enable-libxvid
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
index 5ba8a55934b..83bb26ba1f7 100644
--- a/multimedia/ffmpeg3/Makefile
+++ b/multimedia/ffmpeg3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2020/04/23 17:22:52 nia Exp $
+# $NetBSD: Makefile,v 1.51 2020/04/29 15:11:10 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=	4
+PKGREVISION=	5
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ffmpeg.org/
 COMMENT=	Decoding, encoding and streaming software (v3.x)
diff --git a/multimedia/ffmpeg3/options.mk b/multimedia/ffmpeg3/options.mk
index 381cec59a4a..eb99d00ccb7 100644
--- a/multimedia/ffmpeg3/options.mk
+++ b/multimedia/ffmpeg3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2020/04/29 14:17:48 nia Exp $
+# $NetBSD: options.mk,v 1.20 2020/04/29 15:11:10 nia Exp $
 
 # Global and legacy options
 
@@ -8,10 +8,10 @@ PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=		gnutls openssl
 
 PKG_SUPPORTED_OPTIONS=	ass bluray doc fdk-aac fontconfig freetype jack \
-			lame libvpx opencore-amr opus pulseaudio rpi \
-			rtmp tesseract theora vorbis x11 x264 x265 xvid
+			lame libvpx opencore-amr opus pulseaudio rpi rtmp \
+			speex tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS=	lame ass bluray freetype fontconfig gnutls libvpx \
-			opus theora vorbis x11 x264 x265 xvid
+			opus speex theora vorbis x11 x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=	xcb:x11
 
@@ -88,11 +88,7 @@ CONFIGURE_ARGS+=	--disable-gnutls
 .if !empty(PKG_OPTIONS:Mopencore-amr)
 CONFIGURE_ARGS+=	--enable-libopencore-amrnb
 CONFIGURE_ARGS+=	--enable-libopencore-amrwb
-# "The OpenCORE external libraries are under the Apache License
-# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
-# v2, but not with version 3 of those licenses. So to combine the
-# OpenCORE libraries with FFmpeg, the license version needs to be
-# upgraded by passing --enable-version3 to configure."
+# Apache License 2.0 is incompatible with (L)GPL versions before 3
 CONFIGURE_ARGS+=	--enable-version3
 # TODO: LICENSE
 .include "../../audio/opencore-amr/buildlink3.mk"
@@ -166,6 +162,12 @@ CONFIGURE_ARGS+=	--enable-libopus
 .include "../../audio/libopus/buildlink3.mk"
 .endif
 
+# Speex support
+.if !empty(PKG_OPTIONS:Mspeex)
+CONFIGURE_ARGS+=	--enable-libspeex
+.include "../../audio/speex/buildlink3.mk"
+.endif
+
 # Raspberry Pi support
 .if !empty(PKG_OPTIONS:Mrpi)
 CONFIGURE_ARGS+=	--disable-xvmc
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index cd2be401bc7..b3306bc5e15 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2020/04/23 17:22:52 nia Exp $
+# $NetBSD: Makefile,v 1.27 2020/04/29 15:11:10 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg4/}
-PKGREVISION=	5
+PKGREVISION=	6
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ffmpeg.org/
 COMMENT=	Decoding, encoding and streaming software (v4.x)
diff --git a/multimedia/ffmpeg4/options.mk b/multimedia/ffmpeg4/options.mk
index 46f18bf65d4..2a94f80ab0a 100644
--- a/multimedia/ffmpeg4/options.mk
+++ b/multimedia/ffmpeg4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2020/04/29 14:17:48 nia Exp $
+# $NetBSD: options.mk,v 1.15 2020/04/29 15:11:10 nia Exp $
 
 # Global and legacy options
 
@@ -7,10 +7,10 @@ PKG_OPTIONS_GROUP.ssl=		gnutls mbedtls openssl
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg4
 PKG_SUPPORTED_OPTIONS=	ass av1 bluray doc fdk-aac fontconfig freetype jack \
-			lame libvpx opencore-amr opus pulseaudio rpi \
-			rtmp tesseract theora vorbis x11 x264 x265 xvid
-PKG_SUGGESTED_OPTIONS=	lame ass av1 bluray freetype fontconfig gnutls \
-			libvpx opus theora vorbis x11 x264 x265 xvid
+			lame libvpx opencore-amr opus pulseaudio rpi rtmp \
+			speex tesseract theora vorbis x11 x264 x265 xvid
+PKG_SUGGESTED_OPTIONS=	ass av1 bluray freetype fontconfig gnutls lame \
+			libvpx opus speex theora vorbis x11 x264 x265 xvid
 
 PKG_OPTIONS_LEGACY_OPTS+=	xcb:x11
 
@@ -95,6 +95,9 @@ CONFIGURE_ARGS+=	--disable-gnutls
 # mbedTLS support
 .if !empty(PKG_OPTIONS:Mmbedtls)
 CONFIGURE_ARGS+=	--enable-mbedtls
+# Apache License 2.0 is incompatible with (L)GPL versions before 3
+CONFIGURE_ARGS+=	--enable-version3
+ADDITIONAL_LICENSE+=	AND gnu-lgpl-v3
 .include "../../security/mbedtls/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-mbedtls
@@ -104,13 +107,9 @@ CONFIGURE_ARGS+=	--disable-mbedtls
 .if !empty(PKG_OPTIONS:Mopencore-amr)
 CONFIGURE_ARGS+=	--enable-libopencore-amrnb
 CONFIGURE_ARGS+=	--enable-libopencore-amrwb
-# "The OpenCORE external libraries are under the Apache License
-# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
-# v2, but not with version 3 of those licenses. So to combine the
-# OpenCORE libraries with FFmpeg, the license version needs to be
-# upgraded by passing --enable-version3 to configure."
+# Apache License 2.0 is incompatible with (L)GPL versions before 3
 CONFIGURE_ARGS+=	--enable-version3
-ADDITIONAL_LICENSE+=		AND gnu-lgpl-v3
+ADDITIONAL_LICENSE+=	AND gnu-lgpl-v3
 .include "../../audio/opencore-amr/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrnb
@@ -182,6 +181,12 @@ CONFIGURE_ARGS+=	--enable-libopus
 .include "../../audio/libopus/buildlink3.mk"
 .endif
 
+# Speex support
+.if !empty(PKG_OPTIONS:Mspeex)
+CONFIGURE_ARGS+=	--enable-libspeex
+.include "../../audio/speex/buildlink3.mk"
+.endif
+
 # Raspberry Pi support
 .if !empty(PKG_OPTIONS:Mrpi)
 CONFIGURE_ARGS+=	--disable-xvmc