Date: Mon, 2 Sep 2019 15:48:40 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r510811 - in branches/2019Q3/net/waypipe: . files Message-ID: <201909021548.x82Fme6P045665@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Sep 2 15:48:40 2019 New Revision: 510811 URL: https://svnweb.freebsd.org/changeset/ports/510811 Log: 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) Added: branches/2019Q3/net/waypipe/files/ - copied from r508582, head/net/waypipe/files/ Modified: branches/2019Q3/net/waypipe/Makefile branches/2019Q3/net/waypipe/distinfo branches/2019Q3/net/waypipe/files/patch-neon-freebsd11 Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/net/waypipe/Makefile ============================================================================== --- branches/2019Q3/net/waypipe/Makefile Mon Sep 2 15:43:57 2019 (r510810) +++ branches/2019Q3/net/waypipe/Makefile Mon Sep 2 15:48:40 2019 (r510811) @@ -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 @@ -43,6 +44,15 @@ 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 Modified: branches/2019Q3/net/waypipe/distinfo ============================================================================== --- branches/2019Q3/net/waypipe/distinfo Mon Sep 2 15:43:57 2019 (r510810) +++ branches/2019Q3/net/waypipe/distinfo Mon Sep 2 15:48:40 2019 (r510811) @@ -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 Modified: branches/2019Q3/net/waypipe/files/patch-neon-freebsd11 ============================================================================== --- head/net/waypipe/files/patch-neon-freebsd11 Sun Aug 11 05:05:45 2019 (r508582) +++ branches/2019Q3/net/waypipe/files/patch-neon-freebsd11 Mon Sep 2 15:48:40 2019 (r510811) @@ -1,8 +1,8 @@ - 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__) @@ -37,9 +37,9 @@ #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__)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909021548.x82Fme6P045665>