aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-02-23 17:26:36 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-04-07 20:59:00 +0000
commit70148c11889b8de458a1c3ea23c94d05af404296 (patch)
tree62f5db88aeb7ec1249fc064dc965cb38813da479
parentcdea03ab491cdf68f1e3389c7369b302958f30b5 (diff)
downloadports-70148c11889b8de458a1c3ea23c94d05af404296.tar.gz
ports-70148c11889b8de458a1c3ea23c94d05af404296.zip
x11-toolkits/wlroots: update to 0.13.0
Changes: https://github.com/swaywm/wlroots/releases/tag/0.13.0 Reported by: GitHub (watch releases) Tested by: Evgeniy Khramtsov (via CFT on x11@ list)
-rw-r--r--x11-toolkits/wlroots/Makefile25
-rw-r--r--x11-toolkits/wlroots/distinfo18
-rw-r--r--x11-toolkits/wlroots/pkg-plist5
-rw-r--r--x11-wm/cage/Makefile10
-rw-r--r--x11-wm/cage/distinfo12
-rw-r--r--x11-wm/gamescope/Makefile3
-rw-r--r--x11-wm/gamescope/distinfo4
-rw-r--r--x11-wm/hikari/Makefile3
-rw-r--r--x11-wm/hikari/files/patch-wlroots-0.13439
-rw-r--r--x11-wm/labwc/Makefile7
-rw-r--r--x11-wm/labwc/distinfo8
-rw-r--r--x11-wm/phoc/Makefile9
-rw-r--r--x11-wm/phoc/distinfo2
-rw-r--r--x11-wm/river/Makefile1
-rw-r--r--x11-wm/river/files/patch-wlroots-0.13373
-rw-r--r--x11-wm/sway/Makefile13
-rw-r--r--x11-wm/sway/distinfo18
-rw-r--r--x11-wm/wayfire-plugins-extra/Makefile1
-rw-r--r--x11-wm/wayfire/Makefile14
-rw-r--r--x11-wm/wayfire/distinfo16
20 files changed, 955 insertions, 26 deletions
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index e327aa468266..16ae013a3737 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,10 +1,10 @@
PORTNAME= wlroots
-DISTVERSION= 0.12.0
+DISTVERSION= 0.13.0
CATEGORIES= x11-toolkits
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= 8bdf0df41719.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064
-PATCHFILES+= 90cb6d26877b.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064
+PATCHFILES+= 7c0e2a271a4c.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064
+PATCHFILES+= d3b759ac5f08.patch:-p1 # https://github.com/swaywm/wlroots/pull/2064
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Modular Wayland compositor library
@@ -17,7 +17,7 @@ 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 \
+ libwayland-server.so:graphics/wayland \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= libudev-devd>=0.4.1:devel/libudev-devd \
@@ -31,13 +31,13 @@ USE_LDCONFIG= yes
GH_ACCOUNT= swaywm
MESON_ARGS= -Dexamples=false
-OPTIONS_DEFINE= CONSOLEKIT LIBSEAT X11
-OPTIONS_DEFAULT=LIBSEAT X11
+OPTIONS_DEFINE= CONSOLEKIT LIBSEAT UUID X11
+OPTIONS_DEFAULT=LIBSEAT UUID X11
OPTIONS_SUB= yes
CONSOLEKIT_DESC= DRM sessions without root using ConsoleKit2
CONSOLEKIT_PATCH_SITES= https://github.com/unrelentingtech/${GH_PROJECT}/commit/:ck2
-CONSOLEKIT_PATCHFILES= fcee578b13eb.patch:-p1:ck2 # https://github.com/swaywm/wlroots/pull/1467
+CONSOLEKIT_PATCHFILES= fb837ae10b1f.patch:-p1:ck2 # https://github.com/swaywm/wlroots/pull/1467
CONSOLEKIT_LIB_DEPENDS= libdbus-1.so:devel/dbus \
libconsolekit.so:sysutils/consolekit2
CONSOLEKIT_MESON_ENABLED= consolekit2
@@ -49,10 +49,17 @@ LIBSEAT_DESC= DRM sessions with/without root via libseat (experimental)
LIBSEAT_LIB_DEPENDS= libseat.so:sysutils/seatd
LIBSEAT_MESON_ENABLED= libseat
+# uuid_create() is random on NetBSD and OpenBSD but not DragonFly and FreeBSD
+# See also https://github.com/netbsd/src/commit/8651e9a438af
+UUID_DESC= Exported surfaces to use random UUIDs via libuuid
+UUID_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
+
X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \
+ libxcb-render-util.so:x11/xcb-util-renderutil \
libxcb-icccm.so:x11/xcb-util-wm
+X11_BUILD_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel
X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel
-X11_USE= XORG=x11,xcb
-X11_MESON_ENABLED= x11-backend xcb-icccm xwayland
+X11_USE= XORG=xcb
+X11_MESON_ENABLED= x11-backend xwayland
.include <bsd.port.mk>
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 3706fc23d866..d35910fd7972 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1604844104
-SHA256 (swaywm-wlroots-0.12.0_GH0.tar.gz) = c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb
-SIZE (swaywm-wlroots-0.12.0_GH0.tar.gz) = 476936
-SHA256 (8bdf0df41719.patch) = 038fb04b004f862f5ee9a2ad6f97592c94501283b17af6537d19469467cb2e28
-SIZE (8bdf0df41719.patch) = 5800
-SHA256 (90cb6d26877b.patch) = 65c9c9f45d9916da143b76dec3280f7414c757ff2cf9992897ed69cfcaed5edd
-SIZE (90cb6d26877b.patch) = 3971
-SHA256 (fcee578b13eb.patch) = 641ae85b3730854f9cbafe9f5f27ddc7c79fa5eb59ff1f5d2ea64f6e6179ca29
-SIZE (fcee578b13eb.patch) = 27688
+TIMESTAMP = 1617734115
+SHA256 (swaywm-wlroots-0.13.0_GH0.tar.gz) = f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3
+SIZE (swaywm-wlroots-0.13.0_GH0.tar.gz) = 503575
+SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e
+SIZE (7c0e2a271a4c.patch) = 5729
+SHA256 (d3b759ac5f08.patch) = 82109857db12457632a3a8d5de33830613bbd525f3c724d4aa3ce6fd94a7a57c
+SIZE (d3b759ac5f08.patch) = 4028
+SHA256 (fb837ae10b1f.patch) = ecf07d813ae796eca946e909a35434a93b07fc349d6ca8b48d7834cb2dfb4071
+SIZE (fb837ae10b1f.patch) = 27075
diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist
index 85bed060f161..6e275d0f95b9 100644
--- a/x11-toolkits/wlroots/pkg-plist
+++ b/x11-toolkits/wlroots/pkg-plist
@@ -76,6 +76,9 @@ include/wlr/types/wlr_virtual_keyboard_v1.h
include/wlr/types/wlr_virtual_pointer_v1.h
include/wlr/types/wlr_xcursor_manager.h
include/wlr/types/wlr_xdg_decoration_v1.h
+include/wlr/types/wlr_xdg_foreign_registry.h
+include/wlr/types/wlr_xdg_foreign_v1.h
+include/wlr/types/wlr_xdg_foreign_v2.h
include/wlr/types/wlr_xdg_output_v1.h
include/wlr/types/wlr_xdg_shell.h
include/wlr/util/edges.h
@@ -85,5 +88,5 @@ include/wlr/version.h
include/wlr/xcursor.h
%%X11%%include/wlr/xwayland.h
lib/libwlroots.so
-lib/libwlroots.so.7
+lib/libwlroots.so.8
libdata/pkgconfig/wlroots.pc
diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 3ba6b07a2358..785db5d30ef0 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -1,11 +1,17 @@
PORTNAME= cage
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-wm
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 70ecdcb02ea0.patch:-p1 # https://github.com/Hjdskes/cage/pull/148
+PATCHFILES+= 43f1ea36d669.patch:-p1 # https://github.com/Hjdskes/cage/pull/174
+PATCHFILES+= e3b1a57acaee.patch:-p1 # https://github.com/Hjdskes/cage/pull/174
+PATCHFILES+= 0db62672a4c1.patch:-p1 # https://github.com/Hjdskes/cage/pull/174
+PATCHFILES+= 2852b4e6d024.patch:-p1 # https://github.com/Hjdskes/cage/pull/174
+PATCHFILES+= 956b0cc6a476.patch:-p1 # https://github.com/Hjdskes/cage/pull/174
+PATCHFILES+= e1956ccb723e.patch:-p1 # https://github.com/Hjdskes/cage/pull/174
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Wayland kiosk
@@ -15,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols \
- wlroots>=0.11.0:x11-toolkits/wlroots
+ wlroots>=0.13.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 37e8097a9c86..287d0c9cb86b 100644
--- a/x11-wm/cage/distinfo
+++ b/x11-wm/cage/distinfo
@@ -3,3 +3,15 @@ SHA256 (Hjdskes-cage-v0.1.2.1_GH0.tar.gz) = 38a3e3968f00cc58fe1d9448e972cfac7d1e
SIZE (Hjdskes-cage-v0.1.2.1_GH0.tar.gz) = 24600
SHA256 (70ecdcb02ea0.patch) = 2dd0e99d181986c6b2d5e04e89f692e3d77b8bd2a3a08f94cf8a27b38489eb3c
SIZE (70ecdcb02ea0.patch) = 2137
+SHA256 (43f1ea36d669.patch) = b81ffa42da2ab21d12616315c83c932b7d88c1d365229615c7489ce5129f7010
+SIZE (43f1ea36d669.patch) = 1114
+SHA256 (e3b1a57acaee.patch) = d40a85a5dc75eb0dae37e0f1b9a033d21efa75717177529182e69bd6812bd482
+SIZE (e3b1a57acaee.patch) = 1056
+SHA256 (0db62672a4c1.patch) = 9b7d8a4c3ae8fe10a799b272e3d727bb1c32fc490ad546bc32a6c373c745b556
+SIZE (0db62672a4c1.patch) = 1457
+SHA256 (2852b4e6d024.patch) = 073b0a07897b7f9a134f22c9297dd97fb35233c8265c08b1f3fa54d8bc596cd8
+SIZE (2852b4e6d024.patch) = 7147
+SHA256 (956b0cc6a476.patch) = e77e1266ca9c0e6e119d18ea32669c7494d3d46f71c354c1446014439090f884
+SIZE (956b0cc6a476.patch) = 2993
+SHA256 (e1956ccb723e.patch) = 20cb74a2b070b0b13df437924962dd475afb5510e57fb817b37e999127851ba6
+SIZE (e1956ccb723e.patch) = 1115
diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 771958b44ae2..1e5b25601a35 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gamescope
DISTVERSION= 3.7.1
+PORTREVISION= 1
CATEGORIES= x11-wm
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -8,6 +9,8 @@ PATCHFILES+= 620f8f5bc530.patch:-p1 # https://github.com/Plagman/gamescope/pull/
PATCHFILES+= 892d79b0f37e.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
PATCHFILES+= ae60c865d9d8.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
PATCHFILES+= d59836199ebe.patch:-p1 # https://github.com/Plagman/gamescope/issues/120
+PATCHFILES+= 9d84b38c9042.patch:-p1 # wlroots 0.13
+PATCHFILES+= a9d8a368d809.patch:-p1 # wlroots 0.13
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Micro-compositor from SteamOS
diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
index 4989ae4c8251..a02bbea2aade 100644
--- a/x11-wm/gamescope/distinfo
+++ b/x11-wm/gamescope/distinfo
@@ -13,3 +13,7 @@ SHA256 (ae60c865d9d8.patch) = 41593e80d11a80c17a173cd03330738fc9deb82626c6788e15
SIZE (ae60c865d9d8.patch) = 1111
SHA256 (d59836199ebe.patch) = 40b519ef847b979ba088325cdd7170bed91936b79d845c65d2126b2b25166a1e
SIZE (d59836199ebe.patch) = 2586
+SHA256 (9d84b38c9042.patch) = 635e87956399b4c82c8d5234e48752537aa4621d24d02dc0923f61ed040ebab0
+SIZE (9d84b38c9042.patch) = 1514
+SHA256 (a9d8a368d809.patch) = b3eb5e323b351870a3c97df610bc27e33713623017e4a219b13dbc8b6df752a5
+SIZE (a9d8a368d809.patch) = 912
diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 213d9bde31d6..31120173e6a6 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -1,5 +1,6 @@
PORTNAME= hikari
DISTVERSION= 2.2.3
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= https://hikari.acmelabs.space/releases/
@@ -11,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>=1.14:graphics/wayland-protocols \
- wlroots>=0.9.0<0.13.0:x11-toolkits/wlroots
+ wlroots>=0.13.0<0.14.0:x11-toolkits/wlroots
LIB_DEPENDS= libinput.so:x11/libinput \
libucl.so:textproc/libucl \
libwayland-server.so:graphics/wayland \
diff --git a/x11-wm/hikari/files/patch-wlroots-0.13 b/x11-wm/hikari/files/patch-wlroots-0.13
new file mode 100644
index 000000000000..41ff4f72f408
--- /dev/null
+++ b/x11-wm/hikari/files/patch-wlroots-0.13
@@ -0,0 +1,439 @@
+In file included from src/action.c:7:
+In file included from include/hikari/server.h:29:
+In file included from include/hikari/layer_shell.h:4:
+/usr/local/include/wlr/types/wlr_layer_shell_v1.h:52:52: error: field has incomplete type 'enum zwlr_layer_surface_v1_keyboard_interactivity'
+ enum zwlr_layer_surface_v1_keyboard_interactivity keyboard_interactive;
+ ^
+/usr/local/include/wlr/types/wlr_layer_shell_v1.h:52:7: note: forward declaration of 'enum zwlr_layer_surface_v1_keyboard_interactivity'
+ enum zwlr_layer_surface_v1_keyboard_interactivity keyboard_interactive;
+ ^