diff options
| author | nia <nia@pkgsrc.org> | 2020-04-23 10:29:19 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-04-23 10:29:19 +0000 |
| commit | 0a3ab75586d4ffbaaf20e85090d930be70a34c50 (patch) | |
| tree | de606f839df8af90bc79f47438d98b3c1ceb1d47 /multimedia/ffmpeg2 | |
| parent | b952cef5c5b77c843bdaed0e9673935cf077d637 (diff) | |
| download | pkgsrc-0a3ab75586d4ffbaaf20e85090d930be70a34c50.tar.gz | |
ffmpeg*: Sync default options with ffmpeg4
Diffstat (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/options.mk | 35 |
2 files changed, 31 insertions, 8 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 53a78a56e6f..e3978fa4024 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.54 2020/03/10 22:10:38 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2020/04/23 10:29:19 nia Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 13 +PKGREVISION= 14 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v2.x) diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk index 063bc8c3de9..d5a75d30b98 100644 --- a/multimedia/ffmpeg2/options.mk +++ b/multimedia/ffmpeg2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $ +# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $ # Global and legacy options @@ -7,11 +7,11 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2 PKG_OPTIONS_OPTIONAL_GROUPS= ssl PKG_OPTIONS_GROUP.ssl= gnutls openssl -PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype lame \ - libvpx opencore-amr rtmp theora vorbis x11 x264 \ - x265 xvid -PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx \ - theora vorbis x11 x264 xvid +PKG_SUPPORTED_OPTIONS= ass bluray doc faac fdk-aac fontconfig freetype \ + lame libvpx opencore-amr opus pulseaudio rtmp \ + theora vorbis x11 x264 x265 xvid +PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \ + opus theora vorbis x11 x264 x265 xvid PKG_OPTIONS_LEGACY_OPTS+= xcb:x11 @@ -123,6 +123,15 @@ CONFIGURE_ARGS+= --enable-openssl CONFIGURE_ARGS+= --disable-openssl .endif + +# pulseaudio option +.if !empty(PKG_OPTIONS:Mpulseaudio) +CONFIGURE_ARGS+= --enable-libpulse +.include "../../audio/pulseaudio/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libpulse +.endif + # RTMP support via librtmp .if !empty(PKG_OPTIONS:Mrtmp) CONFIGURE_ARGS+= --enable-librtmp @@ -149,6 +158,12 @@ CONFIGURE_ARGS+= --enable-libmp3lame .include "../../audio/lame/buildlink3.mk" .endif +# OPUS support +.if !empty(PKG_OPTIONS:Mopus) +CONFIGURE_ARGS+= --enable-libopus +.include "../../audio/libopus/buildlink3.mk" +.endif + # XviD support .if !empty(PKG_OPTIONS:Mxvid) CONFIGURE_ARGS+= --enable-libxvid @@ -207,3 +222,11 @@ CONFIGURE_ARGS+= --enable-libxcb-xfixes .else CONFIGURE_ARGS+= --disable-libxcb .endif + +# Bluray support +.if !empty(PKG_OPTIONS:Mbluray) +CONFIGURE_ARGS+= --enable-libbluray +.include "../../multimedia/libbluray/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libbluray +.endif |