CVS commit: pkgsrc/multimedia

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Wed, 29 Apr 2020 15:11:10 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Apr 29 15:11:10 UTC 2020

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/multimedia/ffmpeg2/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/ffmpeg4/Makefile
cvs rdiff -u -r1.14 -r1.15 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/ffmpeg2/Makefile
diff -u pkgsrc/multimedia/ffmpeg2/Makefile:1.57 pkgsrc/multimedia/ffmpeg2/Makefile:1.58
--- pkgsrc/multimedia/ffmpeg2/Makefile:1.57     Thu Apr 23 17:22:51 2020
+++ pkgsrc/multimedia/ffmpeg2/Makefile  Wed Apr 29 15:11:09 2020
@@ -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@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v2.x)

Index: pkgsrc/multimedia/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.18 pkgsrc/multimedia/ffmpeg2/options.mk:1.19
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.18   Thu Apr 23 10:35:40 2020
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Wed Apr 29 15:11:10 2020
@@ -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

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.50 pkgsrc/multimedia/ffmpeg3/Makefile:1.51
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.50     Thu Apr 23 17:22:52 2020
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Wed Apr 29 15:11:10 2020
@@ -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@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v3.x)

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.19 pkgsrc/multimedia/ffmpeg3/options.mk:1.20
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.19   Wed Apr 29 14:17:48 2020
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Wed Apr 29 15:11:10 2020
@@ -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

Index: pkgsrc/multimedia/ffmpeg4/Makefile
diff -u pkgsrc/multimedia/ffmpeg4/Makefile:1.26 pkgsrc/multimedia/ffmpeg4/Makefile:1.27
--- pkgsrc/multimedia/ffmpeg4/Makefile:1.26     Thu Apr 23 17:22:52 2020
+++ pkgsrc/multimedia/ffmpeg4/Makefile  Wed Apr 29 15:11:10 2020
@@ -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@localhost
 HOMEPAGE=      https://ffmpeg.org/
 COMMENT=       Decoding, encoding and streaming software (v4.x)

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.14 pkgsrc/multimedia/ffmpeg4/options.mk:1.15
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.14   Wed Apr 29 14:17:48 2020
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Wed Apr 29 15:11:10 2020
@@ -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 o
 
 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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: Re: CVS commit: pkgsrc/converters/unoconv/files
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index