Index: branches/2020Q2/multimedia/dav1d/Makefile
===================================================================
--- branches/2020Q2/multimedia/dav1d/Makefile	(revision 536256)
+++ branches/2020Q2/multimedia/dav1d/Makefile	(revision 536257)
@@ -1,53 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	dav1d
-DISTVERSION=	0.6.0
+DISTVERSION=	0.7.0
 CATEGORIES=	multimedia
 
-PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/
-PATCHFILES+=	e04227c5f672.diff:-p1 # https://code.videolan.org/videolan/dav1d/-/merge_requests/934
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Small and fast AV1 decoder
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		compiler:c11 meson
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
-GL_COMMIT=	efd9e5518e0ed5114f8b4579debd7ee6dbede21f
+GL_COMMIT=	df40d36d84fbdd3aae827b36d1a15739efb9225b
 
 OPTIONS_DEFINE=	SDL TEST
 OPTIONS_SUB=	yes
 
 SDL_USES=	pkgconfig sdl
 SDL_USE=	SDL=sdl2
 SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
 SDL_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo \
 			libvulkan.so:graphics/vulkan-loader
 SDL_MESON_TRUE=	enable_examples
 
-TEST_GL_TUPLE=	videolan:dav1d-test-data:0b9501d258b50dcf2b86f97214f14f079a1528d0:testdata/tests/dav1d-test-data
+TEST_GL_TUPLE=	videolan:dav1d-test-data:0ce3de3b6f581e44a763fd4b79d32576f998d629:testdata/tests/dav1d-test-data
 TEST_MESON_TRUE=enable_tests testdata_tests
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
 # https://bugs.llvm.org/show_bug.cgi?id=40635
 .if !empty(CFLAGS:M-flto*)
 MESON_ARGS+=	${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${ARCH}}
 MESON_ARGS_clang_amd64=	-Dstack_alignment=16
 MESON_ARGS_clang_i386=	-Dstack_alignment=4
 .endif
 
 pre-install-TEST-on: do-test
 
 .include <bsd.port.mk>
Index: branches/2020Q2/multimedia/dav1d/distinfo
===================================================================
--- branches/2020Q2/multimedia/dav1d/distinfo	(revision 536256)
+++ branches/2020Q2/multimedia/dav1d/distinfo	(revision 536257)
@@ -1,7 +1,5 @@
-TIMESTAMP = 1583450213
-SHA256 (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee6dbede21f_GL0.tar.gz) = f4afcab8460dc805aec60e8430ee89bef25ef6eff6e5971c5064b55ed6c6eb67
-SIZE (videolan-dav1d-efd9e5518e0ed5114f8b4579debd7ee6dbede21f_GL0.tar.gz) = 785514
-SHA256 (videolan-dav1d-test-data-0b9501d258b50dcf2b86f97214f14f079a1528d0_GL0.tar.gz) = 1982f7494c00314bbd9d62fe3ae182fa5b8aa7104e74728d5291fe315744b758
-SIZE (videolan-dav1d-test-data-0b9501d258b50dcf2b86f97214f14f079a1528d0_GL0.tar.gz) = 50232790
-SHA256 (e04227c5f672.diff) = 0ee58a490cbeb5ff9a9fd78442eb749e83f2c005e4d3a433e13f8cfc236d7d6a
-SIZE (e04227c5f672.diff) = 534
+TIMESTAMP = 1589951284
+SHA256 (videolan-dav1d-df40d36d84fbdd3aae827b36d1a15739efb9225b_GL0.tar.gz) = 501de7d8ab8072614ec23a7d890b7e413404af87fb08a6dfa448108dfe91ed67
+SIZE (videolan-dav1d-df40d36d84fbdd3aae827b36d1a15739efb9225b_GL0.tar.gz) = 821932
+SHA256 (videolan-dav1d-test-data-0ce3de3b6f581e44a763fd4b79d32576f998d629_GL0.tar.gz) = 0cd1cc68c3e32a2ca059adcd86eb7900f1afd9dbdc1d6d30697f23a4bd3d8fff
+SIZE (videolan-dav1d-test-data-0ce3de3b6f581e44a763fd4b79d32576f998d629_GL0.tar.gz) = 50234222
Index: branches/2020Q2/multimedia/dav1d/pkg-plist
===================================================================
--- branches/2020Q2/multimedia/dav1d/pkg-plist	(revision 536256)
+++ branches/2020Q2/multimedia/dav1d/pkg-plist	(revision 536257)
@@ -1,12 +1,12 @@
 bin/dav1d
 %%SDL%%bin/dav1dplay
 include/dav1d/common.h
 include/dav1d/data.h
 include/dav1d/dav1d.h
 include/dav1d/headers.h
 include/dav1d/picture.h
 include/dav1d/version.h
 lib/libdav1d.so
 lib/libdav1d.so.4
-lib/libdav1d.so.4.0.0
+lib/libdav1d.so.4.0.1
 libdata/pkgconfig/dav1d.pc
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 536256)
+++ branches/2020Q2	(revision 536257)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r536008