Index: head/x11-toolkits/wlroots/Makefile =================================================================== --- head/x11-toolkits/wlroots/Makefile (revision 500741) +++ head/x11-toolkits/wlroots/Makefile (revision 500742) @@ -1,46 +1,50 @@ # $FreeBSD$ PORTNAME= wlroots -DISTVERSION= 0.5.0 +DISTVERSION= 0.6.0 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.17:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-egl.so:graphics/wayland \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl meson pkgconfig USE_GITHUB= yes USE_GL= egl gbm glesv2 USE_XORG= pixman USE_LDCONFIG= yes GH_ACCOUNT= swaywm 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 X11_USE= XORG=x11,xcb X11_MESON_ENABLED=x11-backend xcb-icccm xwayland post-patch: # Ignore unused dependencies @${REINPLACE_CMD} '/examples/d' ${WRKSRC}/meson.build .include Index: head/x11-toolkits/wlroots/distinfo =================================================================== --- head/x11-toolkits/wlroots/distinfo (revision 500741) +++ head/x11-toolkits/wlroots/distinfo (revision 500742) @@ -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 Index: head/x11-toolkits/wlroots/pkg-plist =================================================================== --- head/x11-toolkits/wlroots/pkg-plist (revision 500741) +++ head/x11-toolkits/wlroots/pkg-plist (revision 500742) @@ -1,87 +1,88 @@ include/wlr/backend.h include/wlr/backend/drm.h include/wlr/backend/headless.h include/wlr/backend/interface.h include/wlr/backend/libinput.h include/wlr/backend/multi.h include/wlr/backend/noop.h include/wlr/backend/session.h include/wlr/backend/session/interface.h include/wlr/backend/wayland.h %%X11%%include/wlr/backend/x11.h include/wlr/config.h include/wlr/interfaces/wlr_input_device.h include/wlr/interfaces/wlr_keyboard.h include/wlr/interfaces/wlr_output.h include/wlr/interfaces/wlr_pointer.h include/wlr/interfaces/wlr_switch.h 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 include/wlr/render/wlr_renderer.h include/wlr/render/wlr_texture.h include/wlr/types/wlr_box.h include/wlr/types/wlr_buffer.h include/wlr/types/wlr_compositor.h include/wlr/types/wlr_cursor.h include/wlr/types/wlr_data_control_v1.h include/wlr/types/wlr_data_device.h include/wlr/types/wlr_export_dmabuf_v1.h include/wlr/types/wlr_foreign_toplevel_management_v1.h include/wlr/types/wlr_fullscreen_shell_v1.h include/wlr/types/wlr_gamma_control.h include/wlr/types/wlr_gamma_control_v1.h include/wlr/types/wlr_gtk_primary_selection.h include/wlr/types/wlr_idle.h include/wlr/types/wlr_idle_inhibit_v1.h include/wlr/types/wlr_input_device.h include/wlr/types/wlr_input_inhibitor.h include/wlr/types/wlr_input_method_v2.h include/wlr/types/wlr_keyboard.h include/wlr/types/wlr_layer_shell_v1.h include/wlr/types/wlr_linux_dmabuf_v1.h include/wlr/types/wlr_list.h 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 include/wlr/types/wlr_presentation_time.h include/wlr/types/wlr_primary_selection.h include/wlr/types/wlr_primary_selection_v1.h include/wlr/types/wlr_region.h include/wlr/types/wlr_relative_pointer_v1.h include/wlr/types/wlr_screencopy_v1.h include/wlr/types/wlr_screenshooter.h include/wlr/types/wlr_seat.h include/wlr/types/wlr_server_decoration.h include/wlr/types/wlr_surface.h include/wlr/types/wlr_switch.h include/wlr/types/wlr_tablet_pad.h include/wlr/types/wlr_tablet_tool.h 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 include/wlr/types/wlr_xdg_shell.h include/wlr/types/wlr_xdg_shell_v6.h include/wlr/util/edges.h include/wlr/util/log.h include/wlr/util/region.h 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 Index: head/x11-wm/cage/Makefile =================================================================== --- head/x11-wm/cage/Makefile (revision 500741) +++ head/x11-wm/cage/Makefile (revision 500742) @@ -1,39 +1,41 @@ # $FreeBSD$ 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 LICENSE= MIT 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 USES= compiler:c11 meson pkgconfig USE_GITHUB= yes USE_XORG= pixman GH_ACCOUNT= Hjdskes PLIST_FILES= "${MAYBE_SUID}bin/${PORTNAME}" OPTIONS_DEFINE= SUID X11 OPTIONS_DEFAULT=SUID X11 SUID_DESC= setuid bit on "${PORTNAME}" binary (required for DRM session) SUID_VARS= MAYBE_SUID="@(,,4755) " X11_MESON_TRUE= xwayland .include Index: head/x11-wm/cage/distinfo =================================================================== --- head/x11-wm/cage/distinfo (revision 500741) +++ head/x11-wm/cage/distinfo (revision 500742) @@ -1,7 +1,9 @@ TIMESTAMP = 1552316236 SHA256 (Hjdskes-cage-v0.1_GH0.tar.gz) = 03e2b4d97744aead935f4a289e5cfda4888dd06c6586982f4a25c8f435ef4166 SIZE (Hjdskes-cage-v0.1_GH0.tar.gz) = 19838 SHA256 (c69d394bedc6.patch) = 0c6101fa17248e170c202b43d682af1f25c9584e324ea01da43c6775ede5c9b4 SIZE (c69d394bedc6.patch) = 654 SHA256 (00fe8d7ce3d5.patch) = 194aef0c60c0a4e9a2a8d6c7b33341caaccb64f183488d009b1a61f8fc06db00 SIZE (00fe8d7ce3d5.patch) = 1258 +SHA256 (7f7a483fb28b.patch) = 1230f1431f33eab2edeb3b1770296fb1d2b8bd3c7a6f965b65eb036ed5dba132 +SIZE (7f7a483fb28b.patch) = 2860 Index: head/x11-wm/sway/Makefile =================================================================== --- head/x11-wm/sway/Makefile (revision 500741) +++ head/x11-wm/sway/Makefile (revision 500742) @@ -1,56 +1,61 @@ # $FreeBSD$ 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 LICENSE= MIT 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 \ libwayland-egl.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= swaywm OPTIONS_DEFINE= MANPAGES PIXBUF SUID X11 OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11 OPTIONS_SUB= yes MANPAGES_BUILD_DEPENDS= scdoc>=1.9.2:textproc/scdoc MANPAGES_MESON_ENABLED= man-pages PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_MESON_ENABLED= gdk-pixbuf SUID_DESC= setuid bit on "sway" binary (required for DRM session) SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " SUID_PLIST_SUB_OFF= MAYBE_SUID="" X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build .include Index: head/x11-wm/sway/distinfo =================================================================== --- head/x11-wm/sway/distinfo (revision 500741) +++ head/x11-wm/sway/distinfo (revision 500742) @@ -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