Hi,
The diff below updates Xwayland to 24.1.0.
ok ?
Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/xwayland/Makefile,v
diff -u -p -u -r1.11 Makefile
--- Makefile 17 Apr 2024 05:53:23 -0000 1.11
+++ Makefile 1 Jun 2024 15:16:19 -0000
@@ -1,6 +1,6 @@
COMMENT = X server running as wayland application
-DISTNAME = xwayland-23.2.6
+DISTNAME = xwayland-24.1.0
CATEGORIES = wayland
@@ -19,7 +19,8 @@ EXTRACT_SUFX = .tar.xz
MODULES = devel/meson
-BUILD_DEPENDS = wayland/libinput-openbsd \
+BUILD_DEPENDS = devel/epoll-shim \
+ wayland/libinput-openbsd \
wayland/wayland-protocols
RUN_DEPENDS = devel/desktop-file-utils
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/xwayland/distinfo,v
diff -u -p -u -r1.5 distinfo
--- distinfo 17 Apr 2024 05:53:23 -0000 1.5
+++ distinfo 1 Jun 2024 15:16:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (xwayland-23.2.6.tar.xz) = HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0=
-SIZE (xwayland-23.2.6.tar.xz) = 1300092
+SHA256 (xwayland-24.1.0.tar.xz) = vvIcTxiAek7VccTi32CrY7VGa71QLszrJIW4kqt23MI=
+SIZE (xwayland-24.1.0.tar.xz) = 1301180
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 1 Jun 2024 15:16:19 -0000
@@ -0,0 +1,16 @@
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -177,6 +177,12 @@ endif
+ libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'],
required: true)
+ build_xwayland = true
+
++if host_machine.system() in ['freebsd', 'openbsd']
++ epoll_dep = dependency('epoll-shim')
++else
++ epoll_dep = []
++endif
++
+ xwayland_path = get_option('xwayland-path')
+ if (xwayland_path == '')
+ xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
Index: patches/patch-os_access_c
===================================================================
RCS file: patches/patch-os_access_c
diff -N patches/patch-os_access_c
--- patches/patch-os_access_c 13 Aug 2023 09:05:20 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-struc ucred on OpenBSD
-
-Index: os/access.c
---- os/access.c.orig
-+++ os/access.c
-@@ -1175,7 +1175,11 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredR
- ucred_t *peercred = NULL;
- const gid_t *gids;
- #elif defined(SO_PEERCRED)
-+#ifndef __OpenBSD__
- struct ucred peercred;
-+#else
-+ struct sockpeercred peercred;
-+#endif
- socklen_t so_len = sizeof(peercred);
- #elif defined(HAVE_GETPEEREID)
- uid_t uid;
Index: patches/patch-present_meson_build
===================================================================
RCS file: patches/patch-present_meson_build
diff -N patches/patch-present_meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-present_meson_build 1 Jun 2024 15:16:19 -0000
@@ -0,0 +1,13 @@
+epoll-shim
+
+Index: present/meson.build
+--- present/meson.build.orig
++++ present/meson.build
+@@ -21,6 +21,7 @@ libxserver_present = static_library('libxserver_presen
+ include_directories: inc,
+ dependencies: [
+ common_dep,
++ epoll_dep,
+ dependency('presentproto', version: '>= 1.2')
+ ],
+ )
--
Matthieu Herrb
