Index: head/net/waypipe/Makefile
===================================================================
--- head/net/waypipe/Makefile	(revision 509125)
+++ head/net/waypipe/Makefile	(revision 509126)
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	waypipe
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.0
 CATEGORIES=	net
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Network transparency with Wayland
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols \
 		wayland>=1.15:graphics/wayland
 
 USES=		compiler:c11 localbase:ldflags meson pkgconfig
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mstoeckl
-GL_COMMIT=	e66f42444d81633f5b413cfe158809efd9c437f0
+GL_COMMIT=	e9ed0829dc2b3207328f73d4e0ffe406c457cb2a
 PLIST_FILES=	bin/${PORTNAME}
 # XXX armv6 needs https://github.com/mesonbuild/meson/commit/147d3f752c41
 CONFIGURE_ENV=	UNAME_m=${ARCH}
 
 # XXX Drop after FreeBSD 12.0 EOL
 .if exists(/usr/lib/clang/6.0.0) || exists(/usr/lib/clang/6.0.1)
 .if ${CC} == cc && (${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386)
 USES:=		${USES:Ncompiler*} # silence warning
 BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 .endif
 .endif
 
 OPTIONS_DEFINE=	FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD
 OPTIONS_DEFAULT=FFMPEG LZ4 MANPAGES OPENGL VAAPI ZSTD
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_MESON_ENABLED=	with_video
 
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZ4_MESON_ENABLED=	with_lz4
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gbm
 OPENGL_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 OPENGL_MESON_ENABLED=	with_dmabuf
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_MESON_ENABLED=	with_vaapi
+VAAPI_IMPLIES=		FFMPEG
 
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MESON_ENABLED=	with_zstd
 
 .include <bsd.port.mk>
Index: head/net/waypipe/distinfo
===================================================================
--- head/net/waypipe/distinfo	(revision 509125)
+++ head/net/waypipe/distinfo	(revision 509126)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565392944
-SHA256 (mstoeckl-waypipe-e66f42444d81633f5b413cfe158809efd9c437f0_GL0.tar.gz) = 4a78dd943b617e2d39a34f4908f7acd0d0d59e838a83f739effcbf4d452bcec0
-SIZE (mstoeckl-waypipe-e66f42444d81633f5b413cfe158809efd9c437f0_GL0.tar.gz) = 135515
+TIMESTAMP = 1565988907
+SHA256 (mstoeckl-waypipe-e9ed0829dc2b3207328f73d4e0ffe406c457cb2a_GL0.tar.gz) = c5eb2dc615e64da4f45797eab93feeb6b9eff4d5ec9be2fd8da7052125404e7f
+SIZE (mstoeckl-waypipe-e9ed0829dc2b3207328f73d4e0ffe406c457cb2a_GL0.tar.gz) = 142432
Index: head/net/waypipe/files/patch-neon-freebsd11
===================================================================
--- head/net/waypipe/files/patch-neon-freebsd11	(revision 509125)
+++ head/net/waypipe/files/patch-neon-freebsd11	(revision 509126)
@@ -1,55 +1,55 @@
 - Implement NEON runtime detection on FreeBSD 11.* armv6
 
---- src/kernel.c.orig	2019-08-09 23:22:24 UTC
-+++ src/kernel.c
-@@ -36,8 +36,36 @@
+--- src/platform.c.orig	2019-08-16 20:55:07 UTC
++++ src/platform.c
+@@ -41,8 +41,36 @@
  #include <asm/hwcap.h>
  #include <sys/auxv.h>
  #elif defined(__FreeBSD__) && defined(__arm__)
 +#if __FreeBSD__ >= 12
  #include <sys/auxv.h>
 +#else
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <elf.h>
 +#include <errno.h>
 +#include <unistd.h>
 +
 +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
 +#endif
  
- size_t run_interval_diff_C(const int diff_window_size,
- 		const void *__restrict__ imod, void *__restrict__ ibase,
-@@ -127,9 +155,13 @@ static bool neon_available(void)
+ #if defined(__linux__)
+ /* memfd_create was introduced in glibc 2.27 */
+@@ -82,9 +110,13 @@ bool neon_available(void)
  #if defined(__linux__) && defined(__arm__)
  	return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0;
  #elif defined(__FreeBSD__) && defined(__arm__)
 +#if __FreeBSD__ < 12
 +	return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0;
 +#else
  	unsigned long hwcap = 0;
  	elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
  	return (hwcap & HWCAP_NEON) != 0;
 +#endif
  #endif
  	return true;
  }