x11-toolkits/wlroots: update to 0.6.0

Changes:	https://github.com/swaywm/wlroots/releases/tag/0.6.0

7 files changed, 29 insertions, 11 deletions

diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 2cf4f8bd58c7..011ba4d42b06 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wlroots
-DISTVERSION=	0.5.0
+DISTVERSION=	0.6.0
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -29,10 +29,14 @@ MESON_ARGS=	-Dexamples=false
 # https://github.com/swaywm/wlroots/issues/1450
 LLD_UNSAFE=	yes
 
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
+OPTIONS_DEFINE=	FREERDP X11
+OPTIONS_DEFAULT=FREERDP X11
 OPTIONS_SUB=	yes
 
+FREERDP_DESC=	RDP backend with freerdp
+FREERDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
+FREERDP_MESON_ENABLED=	freerdp
+
 X11_LIB_DEPENDS=libxcb-errors.so:x11/xcb-util-errors \
 		libxcb-icccm.so:x11/xcb-util-wm
 X11_RUN_DEPENDS=Xwayland:x11-servers/xwayland
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 29a8a6cab2b6..a4ab9682f1af 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552315218
-SHA256 (swaywm-wlroots-0.5.0_GH0.tar.gz) = 3c6d422aaa7ac09a1e4a88d93f07a4d6ef6c5e4d76c3422c240a5783265ed0e3
-SIZE (swaywm-wlroots-0.5.0_GH0.tar.gz) = 481154
+TIMESTAMP = 1556898946
+SHA256 (swaywm-wlroots-0.6.0_GH0.tar.gz) = 9cf3716f3683d800df8b150f256ff66dad65faf13a9d67c284f67a9444d28c70
+SIZE (swaywm-wlroots-0.6.0_GH0.tar.gz) = 497934
diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist
index a90b0aa4cbd6..cae37cc4a2c9 100644
--- a/x11-toolkits/wlroots/pkg-plist
+++ b/x11-toolkits/wlroots/pkg-plist
@@ -19,6 +19,7 @@ include/wlr/interfaces/wlr_tablet_pad.h
 include/wlr/interfaces/wlr_tablet_tool.h
 include/wlr/interfaces/wlr_touch.h
 include/wlr/render/dmabuf.h
+include/wlr/render/drm_format_set.h
 include/wlr/render/egl.h
 include/wlr/render/gles2.h
 include/wlr/render/interface.h
@@ -49,6 +50,7 @@ include/wlr/types/wlr_matrix.h
 include/wlr/types/wlr_output.h
 include/wlr/types/wlr_output_damage.h
 include/wlr/types/wlr_output_layout.h
+include/wlr/types/wlr_output_management_v1.h
 include/wlr/types/wlr_pointer.h
 include/wlr/types/wlr_pointer_constraints_v1.h
 include/wlr/types/wlr_pointer_gestures_v1.h
@@ -69,7 +71,6 @@ include/wlr/types/wlr_tablet_v2.h
 include/wlr/types/wlr_text_input_v3.h
 include/wlr/types/wlr_touch.h
 include/wlr/types/wlr_virtual_keyboard_v1.h
-include/wlr/types/wlr_wl_shell.h
 include/wlr/types/wlr_xcursor_manager.h
 include/wlr/types/wlr_xdg_decoration_v1.h
 include/wlr/types/wlr_xdg_output_v1.h
@@ -82,6 +83,6 @@ include/wlr/version.h
 include/wlr/xcursor.h
 %%X11%%include/wlr/xwayland.h
 lib/libwlroots.so
-lib/libwlroots.so.2
-lib/libwlroots.so.2.3.1
+lib/libwlroots.so.3
+lib/libwlroots.so.3.4.1
 libdata/pkgconfig/wlroots.pc
diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 31242f739398..df3368835430 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -3,11 +3,13 @@
 PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	c69d394bedc6.patch:-p1
 PATCHFILES+=	00fe8d7ce3d5.patch:-p1
+PATCHFILES+=	7f7a483fb28b.patch:-p1
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland kiosk
@@ -17,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.5.0:x11-toolkits/wlroots
+		wlroots>=0.6.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
diff --git a/x11-wm/cage/distinfo b/x11-wm/cage/distinfo
index 57ed35ff305b..4a28d29279b2 100644
--- a/x11-wm/cage/distinfo
+++ b/x11-wm/cage/distinfo
@@ -5,3 +5,5 @@ SHA256 (c69d394bedc6.patch) = 0c6101fa17248e170c202b43d682af1f25c9584e324ea01da4
 SIZE (c69d394bedc6.patch) = 654
 SHA256 (00fe8d7ce3d5.patch) = 194aef0c60c0a4e9a2a8d6c7b33341caaccb64f183488d009b1a61f8fc06db00
 SIZE (00fe8d7ce3d5.patch) = 1258
+SHA256 (7f7a483fb28b.patch) = 1230f1431f33eab2edeb3b1770296fb1d2b8bd3c7a6f965b65eb036ed5dba132
+SIZE (7f7a483fb28b.patch) = 2860
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 5b66eaa9abd6..9e072977d266 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -2,8 +2,13 @@
 
 PORTNAME=	sway
 DISTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	076257a978ce.patch:-p1
+PATCHFILES+=	b6e55064fe24.patch:-p1
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor
 
@@ -12,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
-		wlroots>=0.4.1:x11-toolkits/wlroots
+		wlroots>=0.6.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libpcre.so:devel/pcre \
diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
index 3d8312d57108..3b6b60df196c 100644
--- a/x11-wm/sway/distinfo
+++ b/x11-wm/sway/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1552316236
 SHA256 (swaywm-sway-1.0_GH0.tar.gz) = 24dafd0f1e630e97a5dd47233841adf856b665e2321d6207acfe6b3002d1bc56
 SIZE (swaywm-sway-1.0_GH0.tar.gz) = 5474548
+SHA256 (076257a978ce.patch) = 170de5ec3d9315c681423b3d79cff39e7ec927d5ca960b138987076a9d412f57
+SIZE (076257a978ce.patch) = 16868
+SHA256 (b6e55064fe24.patch) = 47b23fff593587635c92cf1180619db0d6c3f9eca61d78850406204047c5d767
+SIZE (b6e55064fe24.patch) = 1556