diff options
| author | nia <nia@pkgsrc.org> | 2020-04-29 15:11:09 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-04-29 15:11:09 +0000 |
| commit | ca0f516ccc46982190b6923c6b135f2c3e2ba225 (patch) | |
| tree | 9ea82e28dbfac229678a4682a130bc744747e38c /multimedia/ffmpeg4 | |
| parent | 50a4451e4e56e9112a28b59f6e04eb7524f729e1 (diff) | |
| download | pkgsrc-ca0f516ccc46982190b6923c6b135f2c3e2ba225.tar.gz | |
ffmpeg*: Add speex support. Further clarify license mess.
Diffstat (limited to 'multimedia/ffmpeg4')
| -rw-r--r-- | multimedia/ffmpeg4/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg4/options.mk | 27 |
2 files changed, 18 insertions, 13 deletions
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 |