MFH: r506434 r507841 r508582 r509126 r509980

net/waypipe: update to 0.6.1

Changes:	https://gitlab.freedesktop.org/mstoeckl/waypipe/compare/v0.3.0...v0.6.1
Approved by:	ports-secteam (joneum)

3 files changed, 82 insertions, 19 deletions

diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile
index 7ff066bf3d11..cd8393f71fcf 100644
--- a/net/waypipe/Makefile
+++ b/net/waypipe/Makefile
@@ -2,13 +2,9 @@
 
 PORTNAME=	waypipe
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.0
-PORTREVISION=	2
+DISTVERSION=	0.6.1
 CATEGORIES=	net
 
-PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/
-PATCHFILES+=	04b9a483e346.patch:-p1
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Network transparency with Wayland
 
@@ -18,21 +14,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols \
 		wayland>=1.15:graphics/wayland
 
-USES=		compiler:c11 meson pkgconfig
+USES=		compiler:c11 localbase:ldflags meson pkgconfig
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mstoeckl
-GL_COMMIT=	8cf7845e63470490af3af95e178ba5fa74d8056b
+GL_COMMIT=	f78ad85b04ef95daa9a1671aa0375d0e77d19b2f
 PLIST_FILES=	bin/${PORTNAME}
+# XXX armv6 needs https://github.com/mesonbuild/meson/commit/147d3f752c41
+CONFIGURE_ENV=	UNAME_m=${ARCH}
 
-OPTIONS_DEFINE=	DMABUF FFMPEG LZ4 MANPAGES ZSTD
-OPTIONS_DEFAULT=DMABUF FFMPEG LZ4 MANPAGES ZSTD
+# 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
 
-DMABUF_DESC=		File descriptors used to exchange data for e.g., OpenGL applications
-DMABUF_USES=		gl
-DMABUF_USE=		GL=gbm
-DMABUF_LIB_DEPENDS=	libdrm.so:graphics/libdrm
-DMABUF_MESON_ENABLED=	with_dmabuf
+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
@@ -44,6 +45,15 @@ 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
 
diff --git a/net/waypipe/distinfo b/net/waypipe/distinfo
index 4c98903da6ca..da8f4b884f96 100644
--- a/net/waypipe/distinfo
+++ b/net/waypipe/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1562359126
-SHA256 (mstoeckl-waypipe-8cf7845e63470490af3af95e178ba5fa74d8056b_GL0.tar.gz) = b1db24d2b9cab37ac4eae05ca0c6d8d27faee3121d2bc025ec56ebcb0ae4fcb7
-SIZE (mstoeckl-waypipe-8cf7845e63470490af3af95e178ba5fa74d8056b_GL0.tar.gz) = 110108
-SHA256 (04b9a483e346.patch) = 705a97b2fe678b841b53afebcadda71726c64b15ea39dd52329ae36e3b40715d
-SIZE (04b9a483e346.patch) = 2254
+TIMESTAMP = 1566861480
+SHA256 (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 4bbfcc046ebde67e210433ab7efbb2d92cea62d7088fc2a95405caf8d93d5593
+SIZE (mstoeckl-waypipe-f78ad85b04ef95daa9a1671aa0375d0e77d19b2f_GL0.tar.gz) = 143440
diff --git a/net/waypipe/files/patch-neon-freebsd11 b/net/waypipe/files/patch-neon-freebsd11
new file mode 100644
index 000000000000..88402ac0ae27
--- /dev/null
+++ b/net/waypipe/files/patch-neon-freebsd11
@@ -0,0 +1,55 @@
+- Implement NEON runtime detection on FreeBSD 11.* armv6
+
+--- 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
+ 
+ #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;
+ }