Index: branches/2019Q2/multimedia/dav1d/Makefile
===================================================================
--- branches/2019Q2/multimedia/dav1d/Makefile	(revision 501344)
+++ branches/2019Q2/multimedia/dav1d/Makefile	(revision 501345)
@@ -1,43 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	dav1d
-DISTVERSION=	0.3.0
+DISTVERSION=	0.3.1
 CATEGORIES=	multimedia
 
 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=	de2059a1167ed560269c3253768929ef19cae989
+GL_COMMIT=	c9427fd43a17d654402f49f8ce28c4991c7024da
 CONFIGURE_ENV=	UNAME_m=${ARCH} # XXX cpu_family()
 
 OPTIONS_DEFINE=	TEST
 
 TEST_GL_TUPLE=	videolan:dav1d-test-data:3ccdd3df4fb8583d58bcc0101e315b00ec3ae130:testdata/tests/dav1d-test-data
 TEST_MESON_TRUE=build_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/2019Q2/multimedia/dav1d/distinfo
===================================================================
--- branches/2019Q2/multimedia/dav1d/distinfo	(revision 501344)
+++ branches/2019Q2/multimedia/dav1d/distinfo	(revision 501345)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1556557488
-SHA256 (videolan-dav1d-de2059a1167ed560269c3253768929ef19cae989_GL0.tar.gz) = ed8d96bef1e7117179031e2bda77a690ce9db00e34e269fc2a5861feb65b345e
-SIZE (videolan-dav1d-de2059a1167ed560269c3253768929ef19cae989_GL0.tar.gz) = 569344
+TIMESTAMP = 1557588190
+SHA256 (videolan-dav1d-c9427fd43a17d654402f49f8ce28c4991c7024da_GL0.tar.gz) = fad9d74887ad228e580fe09ffb1382e8ed001abe940f8ab6aedc5b538a6b72fa
+SIZE (videolan-dav1d-c9427fd43a17d654402f49f8ce28c4991c7024da_GL0.tar.gz) = 574244
 SHA256 (videolan-dav1d-test-data-3ccdd3df4fb8583d58bcc0101e315b00ec3ae130_GL0.tar.gz) = 4ac0c3fa7993f53c6e5f03fda28252269ecd6ca11bcd96f6026cb0c2edb64d41
 SIZE (videolan-dav1d-test-data-3ccdd3df4fb8583d58bcc0101e315b00ec3ae130_GL0.tar.gz) = 31340228
Index: branches/2019Q2/multimedia/dav1d/files/patch-neon-freebsd11
===================================================================
--- branches/2019Q2/multimedia/dav1d/files/patch-neon-freebsd11	(revision 501344)
+++ branches/2019Q2/multimedia/dav1d/files/patch-neon-freebsd11	(revision 501345)
@@ -1,42 +1,41 @@
 - Implement NEON runtime detection on FreeBSD 11.* armv6
 
---- src/arm/cpu.c.orig	2018-12-11 14:14:56 UTC
+--- src/arm/cpu.c.orig	2019-05-11 15:23:10 UTC
 +++ src/arm/cpu.c
-@@ -68,7 +68,37 @@ static unsigned parse_proc_cpuinfo(const char *flag) {
+@@ -75,6 +75,36 @@ static unsigned parse_proc_cpuinfo(const char *flag) {
  }
  #endif
  
 +#if defined(__FreeBSD__) && __FreeBSD__ < 12
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <elf.h>
 +#include <errno.h>
 +#include <unistd.h>
 +
 +#define HAVE_GETAUXVAL
 +#define NEON_HWCAP HWCAP_NEON
 +static unsigned long getauxval(unsigned long type) {
 +  Elf_Auxinfo auxv[AT_COUNT];
 +  size_t len = sizeof(auxv);
 +  int mib[] = {
 +    CTL_KERN,
 +    KERN_PROC,
 +    KERN_PROC_AUXV,
 +    getpid(),
 +  };
 +
 +  if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) {
 +    for (size_t i = 0; i < nitems(auxv); i++)
 +      if ((unsigned long)auxv[i].a_type == type)
 +        return auxv[i].a_un.a_val;
 +
 +    errno = ENOENT;
 +  }
 +  return 0;
 +}
 +#endif
 +
- unsigned dav1d_get_cpu_flags_arm(void) {
+ COLD unsigned dav1d_get_cpu_flags_arm(void) {
      unsigned flags = 0;
  #if ARCH_AARCH64
-     flags |= DAV1D_ARM_CPU_FLAG_NEON;
Index: branches/2019Q2/multimedia/dav1d/pkg-plist
===================================================================
--- branches/2019Q2/multimedia/dav1d/pkg-plist	(revision 501344)
+++ branches/2019Q2/multimedia/dav1d/pkg-plist	(revision 501345)
@@ -1,11 +1,11 @@
 bin/dav1d
 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.1
-lib/libdav1d.so.1.0.1
+lib/libdav1d.so.1.1.0
 libdata/pkgconfig/dav1d.pc
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 501344)
+++ branches/2019Q2	(revision 501345)

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