Mon May 17 12:19:07 2021 UTC ()
ffmpeg4: build with dav1d support for decoding AV1

results in significantly lower CPU usage when decoding the reference
AV1 videos on my x250

bump PKGREVISION


(nia)
diff -r1.50 -r1.51 pkgsrc/multimedia/ffmpeg4/Makefile
diff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg4/options.mk
cvs diff -r1.50 -r1.51 pkgsrc/multimedia/ffmpeg4/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/Makefile 2021/05/07 11:40:11 1.50
+++ pkgsrc/multimedia/ffmpeg4/Makefile 2021/05/17 12:19:07 1.51
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.50 2021/05/07 11:40:11 rin Exp $ 1# $NetBSD: Makefile,v 1.51 2021/05/17 12:19:07 nia Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/}
4PKGREVISION= 4 4PKGREVISION= 5
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= https://ffmpeg.org/ 6HOMEPAGE= https://ffmpeg.org/
7COMMENT= Decoding, encoding and streaming software (v4.x) 7COMMENT= Decoding, encoding and streaming software (v4.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/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4 15INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
cvs diff -r1.16 -r1.17 pkgsrc/multimedia/ffmpeg4/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/options.mk 2020/09/12 00:45:22 1.16
+++ pkgsrc/multimedia/ffmpeg4/options.mk 2021/05/17 12:19:07 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.16 2020/09/12 00:45:22 manu Exp $ 1# $NetBSD: options.mk,v 1.17 2021/05/17 12:19:07 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 jack \ 9PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype jack \
10 lame libvpx libwebp opencore-amr opus pulseaudio rpi rtmp \ 10 lame libvpx libwebp opencore-amr opus pulseaudio rpi rtmp \
11 speex tesseract theora vorbis x11 x264 x265 xvid 11 speex tesseract theora vorbis x11 x264 x265 xvid
12PKG_SUGGESTED_OPTIONS= ass av1 bluray freetype fontconfig gnutls lame \ 12PKG_SUGGESTED_OPTIONS= ass av1 bluray freetype fontconfig gnutls lame \
13 libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid 13 libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid
14 14
@@ -50,29 +50,32 @@ CONFIGURE_ARGS+= --disable-libfreetype @@ -50,29 +50,32 @@ CONFIGURE_ARGS+= --disable-libfreetype
50 50
51# ass option 51# ass option
52.if !empty(PKG_OPTIONS:Mass) 52.if !empty(PKG_OPTIONS:Mass)
53CONFIGURE_ARGS+= --enable-libass 53CONFIGURE_ARGS+= --enable-libass
54.include "../../multimedia/libass/buildlink3.mk" 54.include "../../multimedia/libass/buildlink3.mk"
55.else 55.else
56CONFIGURE_ARGS+= --disable-libass 56CONFIGURE_ARGS+= --disable-libass
57.endif 57.endif
58 58
59# av1 option 59# av1 option
60.if !empty(PKG_OPTIONS:Mav1) 60.if !empty(PKG_OPTIONS:Mav1)
61CONFIGURE_ARGS+= --enable-libaom 61CONFIGURE_ARGS+= --enable-libaom
62BUILDLINK_API_DEPENDS.libaom+= libaom>=1.0.0nb1 62BUILDLINK_API_DEPENDS.libaom+= libaom>=1.0.0nb1
 63CONFIGURE_ARGS+= --enable-libdav1d
63.include "../../multimedia/libaom/buildlink3.mk" 64.include "../../multimedia/libaom/buildlink3.mk"
 65.include "../../multimedia/dav1d/buildlink3.mk"
64.else 66.else
65CONFIGURE_ARGS+= --disable-libaom 67CONFIGURE_ARGS+= --disable-libaom
 68CONFIGURE_ARGS+= --disable-libdav1d
66.endif 69.endif
67 70
68# doc option 71# doc option
69.if !empty(PKG_OPTIONS:Mdoc) 72.if !empty(PKG_OPTIONS:Mdoc)
70PLIST.doc= yes 73PLIST.doc= yes
71USE_TOOLS+= texi2html 74USE_TOOLS+= texi2html
72CONFIGURE_ARGS+= --enable-htmlpages 75CONFIGURE_ARGS+= --enable-htmlpages
73.else 76.else
74CONFIGURE_ARGS+= --disable-htmlpages 77CONFIGURE_ARGS+= --disable-htmlpages
75.endif 78.endif
76 79
77# Fraunhofer FDK AAC codec support 80# Fraunhofer FDK AAC codec support
78.if !empty(PKG_OPTIONS:Mfdk-aac) 81.if !empty(PKG_OPTIONS:Mfdk-aac)