Thu Apr 23 10:29:19 2020 UTC ()
ffmpeg*: Sync default options with ffmpeg4


(nia)
diff -r1.54 -r1.55 pkgsrc/multimedia/ffmpeg2/Makefile
diff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg2/options.mk
diff -r1.48 -r1.49 pkgsrc/multimedia/ffmpeg3/Makefile
diff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg3/options.mk
diff -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg4/options.mk
cvs diff -r1.54 -r1.55 pkgsrc/multimedia/ffmpeg2/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile 2020/03/10 22:10:38 1.54
+++ pkgsrc/multimedia/ffmpeg2/Makefile 2020/04/23 10:29:19 1.55
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.54 2020/03/10 22:10:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.55 2020/04/23 10:29:19 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/}
4PKGREVISION= 13 4PKGREVISION= 14
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 (v2.x) 7COMMENT= Decoding, encoding and streaming software (v2.x)
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 10#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12CONFIGURE_ARGS+= --disable-ffplay 12CONFIGURE_ARGS+= --disable-ffplay
13 13
14INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2 14INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2
15 15
16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \ 16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \
17 ${PKG_SYSCONFDIR}/ffserver.conf 17 ${PKG_SYSCONFDIR}/ffserver.conf
cvs diff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg2/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/options.mk 2019/06/18 14:41:09 1.16
+++ pkgsrc/multimedia/ffmpeg2/options.mk 2020/04/23 10:29:19 1.17
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $ 1# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2
6 6
7PKG_OPTIONS_OPTIONAL_GROUPS= ssl 7PKG_OPTIONS_OPTIONAL_GROUPS= ssl
8PKG_OPTIONS_GROUP.ssl= gnutls openssl 8PKG_OPTIONS_GROUP.ssl= gnutls openssl
9 9
10PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype lame \ 10PKG_SUPPORTED_OPTIONS= ass bluray doc faac fdk-aac fontconfig freetype \
11 libvpx opencore-amr rtmp theora vorbis x11 x264 \ 11 lame libvpx opencore-amr opus pulseaudio rtmp \
12 x265 xvid 12 theora vorbis x11 x264 x265 xvid
13PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx \ 13PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \
14 theora vorbis x11 x264 xvid 14 opus theora vorbis x11 x264 x265 xvid
15 15
16PKG_OPTIONS_LEGACY_OPTS+= xcb:x11 16PKG_OPTIONS_LEGACY_OPTS+= xcb:x11
17 17
18PLIST_VARS+= doc 18PLIST_VARS+= doc
19 19
20# Add VDPAU if it is available 20# Add VDPAU if it is available
21.include "../../multimedia/libvdpau/available.mk" 21.include "../../multimedia/libvdpau/available.mk"
22.if ${VDPAU_AVAILABLE} == "yes" 22.if ${VDPAU_AVAILABLE} == "yes"
23PKG_SUPPORTED_OPTIONS+= vdpau 23PKG_SUPPORTED_OPTIONS+= vdpau
24PKG_SUGGESTED_OPTIONS+= vdpau 24PKG_SUGGESTED_OPTIONS+= vdpau
25.endif 25.endif
26 26
27# Add VAAPI if it is available 27# Add VAAPI if it is available
@@ -113,52 +113,67 @@ CONFIGURE_ARGS+= --enable-version3 @@ -113,52 +113,67 @@ CONFIGURE_ARGS+= --enable-version3
113CONFIGURE_ARGS+= --disable-libopencore-amrnb 113CONFIGURE_ARGS+= --disable-libopencore-amrnb
114CONFIGURE_ARGS+= --disable-libopencore-amrwb 114CONFIGURE_ARGS+= --disable-libopencore-amrwb
115.endif 115.endif
116 116
117# OpenSSL support 117# OpenSSL support
118.if !empty(PKG_OPTIONS:Mopenssl) 118.if !empty(PKG_OPTIONS:Mopenssl)
119CONFIGURE_ARGS+= --enable-nonfree 119CONFIGURE_ARGS+= --enable-nonfree
120CONFIGURE_ARGS+= --enable-openssl 120CONFIGURE_ARGS+= --enable-openssl
121.include "../../security/openssl/buildlink3.mk" 121.include "../../security/openssl/buildlink3.mk"
122.else 122.else
123CONFIGURE_ARGS+= --disable-openssl 123CONFIGURE_ARGS+= --disable-openssl
124.endif 124.endif
125 125
 126
 127# pulseaudio option
 128.if !empty(PKG_OPTIONS:Mpulseaudio)
 129CONFIGURE_ARGS+= --enable-libpulse
 130.include "../../audio/pulseaudio/buildlink3.mk"
 131.else
 132CONFIGURE_ARGS+= --disable-libpulse
 133.endif
 134
126# RTMP support via librtmp 135# RTMP support via librtmp
127.if !empty(PKG_OPTIONS:Mrtmp) 136.if !empty(PKG_OPTIONS:Mrtmp)
128CONFIGURE_ARGS+= --enable-librtmp 137CONFIGURE_ARGS+= --enable-librtmp
129.include "../../net/rtmpdump/buildlink3.mk" 138.include "../../net/rtmpdump/buildlink3.mk"
130.endif 139.endif
131 140
132# OGG Theora support 141# OGG Theora support
133.if !empty(PKG_OPTIONS:Mtheora) 142.if !empty(PKG_OPTIONS:Mtheora)
134CONFIGURE_ARGS+= --enable-libtheora 143CONFIGURE_ARGS+= --enable-libtheora
135.include "../../multimedia/libtheora/buildlink3.mk" 144.include "../../multimedia/libtheora/buildlink3.mk"
136.endif 145.endif
137 146
138# OGG Vorbis support 147# OGG Vorbis support
139.if !empty(PKG_OPTIONS:Mvorbis) 148.if !empty(PKG_OPTIONS:Mvorbis)
140CONFIGURE_ARGS+= --enable-libvorbis 149CONFIGURE_ARGS+= --enable-libvorbis
141.include "../../audio/libvorbis/buildlink3.mk" 150.include "../../audio/libvorbis/buildlink3.mk"
142.endif 151.endif
143 152
144# LAME MP3 encoder 153# LAME MP3 encoder
145.if !empty(PKG_OPTIONS:Mlame) 154.if !empty(PKG_OPTIONS:Mlame)
146# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding. 155# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding.
147BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 156BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1
148CONFIGURE_ARGS+= --enable-libmp3lame 157CONFIGURE_ARGS+= --enable-libmp3lame
149.include "../../audio/lame/buildlink3.mk" 158.include "../../audio/lame/buildlink3.mk"
150.endif 159.endif
151 160
 161# OPUS support
 162.if !empty(PKG_OPTIONS:Mopus)
 163CONFIGURE_ARGS+= --enable-libopus
 164.include "../../audio/libopus/buildlink3.mk"
 165.endif
 166
152# XviD support 167# XviD support
153.if !empty(PKG_OPTIONS:Mxvid) 168.if !empty(PKG_OPTIONS:Mxvid)
154CONFIGURE_ARGS+= --enable-libxvid 169CONFIGURE_ARGS+= --enable-libxvid
155.include "../../multimedia/xvidcore/buildlink3.mk" 170.include "../../multimedia/xvidcore/buildlink3.mk"
156.endif 171.endif
157 172
158# x264 support 173# x264 support
159.if !empty(PKG_OPTIONS:Mx264) 174.if !empty(PKG_OPTIONS:Mx264)
160# ABI change between 20090326 and 20100201 175# ABI change between 20090326 and 20100201
161BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 176BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207
162CONFIGURE_ARGS+= --enable-libx264 177CONFIGURE_ARGS+= --enable-libx264
163.include "../../multimedia/x264-devel/buildlink3.mk" 178.include "../../multimedia/x264-devel/buildlink3.mk"
164.else 179.else
@@ -197,13 +212,21 @@ CONFIGURE_ARGS+= --enable-libvpx @@ -197,13 +212,21 @@ CONFIGURE_ARGS+= --enable-libvpx
197CONFIGURE_ARGS+= --disable-libvpx 212CONFIGURE_ARGS+= --disable-libvpx
198.endif 213.endif
199 214
200# X11 screen capture support using libxcb 215# X11 screen capture support using libxcb
201.if !empty(PKG_OPTIONS:Mx11) 216.if !empty(PKG_OPTIONS:Mx11)
202CONFIGURE_ARGS+= --enable-libxcb 217CONFIGURE_ARGS+= --enable-libxcb
203CONFIGURE_ARGS+= --enable-libxcb-shape 218CONFIGURE_ARGS+= --enable-libxcb-shape
204CONFIGURE_ARGS+= --enable-libxcb-shm 219CONFIGURE_ARGS+= --enable-libxcb-shm
205CONFIGURE_ARGS+= --enable-libxcb-xfixes 220CONFIGURE_ARGS+= --enable-libxcb-xfixes
206.include "../../x11/libxcb/buildlink3.mk" 221.include "../../x11/libxcb/buildlink3.mk"
207.else 222.else
208CONFIGURE_ARGS+= --disable-libxcb 223CONFIGURE_ARGS+= --disable-libxcb
209.endif 224.endif
 225
 226# Bluray support
 227.if !empty(PKG_OPTIONS:Mbluray)
 228CONFIGURE_ARGS+= --enable-libbluray
 229.include "../../multimedia/libbluray/buildlink3.mk"
 230.else
 231CONFIGURE_ARGS+= --disable-libbluray
 232.endif
cvs diff -r1.48 -r1.49 pkgsrc/multimedia/ffmpeg3/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile 2020/03/10 22:10:38 1.48
+++ pkgsrc/multimedia/ffmpeg3/Makefile 2020/04/23 10:29:19 1.49
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.48 2020/03/10 22:10:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.49 2020/04/23 10:29:19 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/}
4PKGREVISION= 3 4PKGREVISION= 4
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 (v3.x) 7COMMENT= Decoding, encoding and streaming software (v3.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/ffmpeg3 share/doc/ffmpeg3 share/examples/ffmpeg3 15INSTALLATION_DIRS= lib/ffmpeg3 share/doc/ffmpeg3 share/examples/ffmpeg3
16 16
17CONF_FILES+= ${PREFIX}/share/examples/ffmpeg3/ffserver.conf \ 17CONF_FILES+= ${PREFIX}/share/examples/ffmpeg3/ffserver.conf \
cvs diff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg3/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/options.mk 2019/06/18 14:41:09 1.16
+++ pkgsrc/multimedia/ffmpeg3/options.mk 2020/04/23 10:29:19 1.17
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $ 1# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3
6 6
7PKG_OPTIONS_OPTIONAL_GROUPS= ssl 7PKG_OPTIONS_OPTIONAL_GROUPS= ssl
8PKG_OPTIONS_GROUP.ssl= gnutls openssl 8PKG_OPTIONS_GROUP.ssl= gnutls openssl
9 9
10PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype \ 10PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype \
11 lame libvpx opencore-amr opus rpi rtmp \ 11 lame libvpx opencore-amr opus pulseaudio rpi \
12 tesseract theora vorbis x11 x264 x265 xvid 12 rtmp tesseract theora vorbis x11 x264 x265 xvid
13PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \ 13PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig gnutls libvpx \
14 theora vorbis x11 x264 xvid 14 opus theora vorbis x11 x264 x265 xvid
15 15
16PKG_OPTIONS_LEGACY_OPTS+= xcb:x11 16PKG_OPTIONS_LEGACY_OPTS+= xcb:x11
17 17
18PLIST_VARS+= doc 18PLIST_VARS+= doc
19 19
20# Add VDPAU if it is available 20# Add VDPAU if it is available
21.include "../../multimedia/libvdpau/available.mk" 21.include "../../multimedia/libvdpau/available.mk"
22.if ${VDPAU_AVAILABLE} == "yes" 22.if ${VDPAU_AVAILABLE} == "yes"
23PKG_SUPPORTED_OPTIONS+= vdpau 23PKG_SUPPORTED_OPTIONS+= vdpau
24PKG_SUGGESTED_OPTIONS+= vdpau 24PKG_SUGGESTED_OPTIONS+= vdpau
25.endif 25.endif
26 26
27# Add VAAPI if it is available 27# Add VAAPI if it is available
@@ -100,26 +100,34 @@ CONFIGURE_ARGS+= --enable-version3 @@ -100,26 +100,34 @@ CONFIGURE_ARGS+= --enable-version3
100CONFIGURE_ARGS+= --disable-libopencore-amrnb 100CONFIGURE_ARGS+= --disable-libopencore-amrnb
101CONFIGURE_ARGS+= --disable-libopencore-amrwb 101CONFIGURE_ARGS+= --disable-libopencore-amrwb
102.endif 102.endif
103 103
104# OpenSSL support 104# OpenSSL support
105.if !empty(PKG_OPTIONS:Mopenssl) 105.if !empty(PKG_OPTIONS:Mopenssl)
106CONFIGURE_ARGS+= --enable-nonfree 106CONFIGURE_ARGS+= --enable-nonfree
107CONFIGURE_ARGS+= --enable-openssl 107CONFIGURE_ARGS+= --enable-openssl
108.include "../../security/openssl/buildlink3.mk" 108.include "../../security/openssl/buildlink3.mk"
109.else 109.else
110CONFIGURE_ARGS+= --disable-openssl 110CONFIGURE_ARGS+= --disable-openssl
111.endif 111.endif
112 112
 113# pulseaudio option
 114.if !empty(PKG_OPTIONS:Mpulseaudio)
 115CONFIGURE_ARGS+= --enable-libpulse
 116.include "../../audio/pulseaudio/buildlink3.mk"
 117.else
 118CONFIGURE_ARGS+= --disable-libpulse
 119.endif
 120
113# RTMP support via librtmp 121# RTMP support via librtmp
114.if !empty(PKG_OPTIONS:Mrtmp) 122.if !empty(PKG_OPTIONS:Mrtmp)
115CONFIGURE_ARGS+= --enable-librtmp 123CONFIGURE_ARGS+= --enable-librtmp
116.include "../../net/rtmpdump/buildlink3.mk" 124.include "../../net/rtmpdump/buildlink3.mk"
117.endif 125.endif
118 126
119# OCR filter using Tesseract 127# OCR filter using Tesseract
120.if !empty(PKG_OPTIONS:Mtesseract) 128.if !empty(PKG_OPTIONS:Mtesseract)
121CONFIGURE_ARGS+= --enable-libtesseract 129CONFIGURE_ARGS+= --enable-libtesseract
122.include "../../graphics/tesseract/buildlink3.mk" 130.include "../../graphics/tesseract/buildlink3.mk"
123.else 131.else
124CONFIGURE_ARGS+= --disable-libtesseract 132CONFIGURE_ARGS+= --disable-libtesseract
125.endif 133.endif
cvs diff -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg4/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/options.mk 2020/04/19 18:25:07 1.11
+++ pkgsrc/multimedia/ffmpeg4/options.mk 2020/04/23 10:29:19 1.12
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: options.mk,v 1.11 2020/04/19 18:25:07 nia Exp $ 1# $NetBSD: options.mk,v 1.12 2020/04/23 10:29:19 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 mbedtls 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 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 gnutls \ 12PKG_SUGGESTED_OPTIONS= lame ass av1 bluray freetype fontconfig gnutls \
13 libvpx opus theora vorbis x11 x264 x265 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