Re: update: wlroots 0.18.1

On Tue, Nov 05, 2024 at 05:38:45PM +0100, Matthieu Herrb wrote:
> On Tue, Nov 05, 2024 at 03:49:51PM +0100, Landry Breuil wrote:
> > Le Tue, Nov 05, 2024 at 10:59:34AM +0100, Matthieu Herrb a écrit :
> > > Hi
> > >
> > > This updates wlroots to 0.18.1. It will be needed for sway
> > > 0.10. Wayfire will need an update too (landry is working on it)
> >
> > i suppose there's a missing patch to render/drm_syncobj.c to make
> > OpenBSD use the FreeBSD codepath ?
> >
> > ../wlroots-0.18.1/render/drm_syncobj.c:132:10: error: use of undeclared
> > identifier 'ETIME'
> > etime = ETIME;
> > ^
> > 1 error generated.
> >
>
> Yes sorry I forgot to cvs add it before generating the diff.

With the updated diff :

Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/Makefile,v
diff -u -p -u -r1.9 Makefile
--- Makefile 30 Jun 2024 13:22:53 -0000 1.9
+++ Makefile 5 Nov 2024 16:40:55 -0000
@@ -1,6 +1,6 @@
COMMENT = modular Wayland compositor library

-V = 0.17.4
+V = 0.18.1
EPOCH = 0
DISTNAME = wlroots-${V}
CATEGORIES = wayland
@@ -12,12 +12,12 @@ HOMEPAGE = https://gitlab.freedesktop.or
# MIT
PERMIT_PACKAGE = Yes

-SHARED_LIBS += wlroots 0.1 # 0.0
+SHARED_LIBS += wlroots-0.18 0.0 # 0.0

MODULES = devel/meson

WANTLIB += EGL GLESv2 drm gbm m pixman-1
-WANTLIB += display-info liftoff udev
+WANTLIB += display-info lcms2 liftoff udev
WANTLIB += input seat
WANTLIB += vulkan wayland-client wayland-server
WANTLIB += xcb xcb-composite xcb-dri3 xcb-errors xcb-ewmh
@@ -37,6 +37,7 @@ BUILD_DEPENDS = \
wayland/xwayland

LIB_DEPENDS = \
+ graphics/lcms2 \
graphics/libliftoff \
graphics/vulkan-loader \
sysutils/libdisplay-info \
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/distinfo,v
diff -u -p -u -r1.6 distinfo
--- distinfo 30 Jun 2024 13:22:53 -0000 1.6
+++ distinfo 5 Nov 2024 16:40:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (wlroots-0.17.4.tar.gz) = 0xkNGdA0RpVeaKksd9THSveDhLDbOahaCxWCrcgPNtE=
-SIZE (wlroots-0.17.4.tar.gz) = 609179
+SHA256 (wlroots-0.18.1.tar.gz) = ucS/70Ej/p+GYigLhR48V0GSdFcXQxWCaCe/u3BhKHg=
+SIZE (wlroots-0.18.1.tar.gz) = 628648
Index: patches/patch-meson_build
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/patches/patch-meson_build,v
diff -u -p -u -r1.1 patch-meson_build
--- patches/patch-meson_build 25 Nov 2023 11:16:14 -0000 1.1
+++ patches/patch-meson_build 5 Nov 2024 16:40:55 -0000
@@ -1,7 +1,9 @@
+No librt on OpenBSD
+
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -145,7 +145,6 @@ pixman = dependency('pixman-1',
+@@ -134,7 +134,6 @@ pixman = dependency('pixman-1',
default_options: ['werror=false'],
)
math = cc.find_library('m')
@@ -9,7 +11,7 @@ Index: meson.build

wlr_files = []
wlr_deps = [
-@@ -154,7 +153,6 @@ wlr_deps = [
+@@ -143,7 +142,6 @@ wlr_deps = [
xkbcommon,
pixman,
math,
Index: patches/patch-render_drm_syncobj_c
===================================================================
RCS file: patches/patch-render_drm_syncobj_c
diff -N patches/patch-render_drm_syncobj_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-render_drm_syncobj_c 5 Nov 2024 16:40:55 -0000
@@ -0,0 +1,14 @@
+ETIMEDOUT on OpenBSD, not ETIME
+
+Index: render/drm_syncobj.c
+--- render/drm_syncobj.c.orig
++++ render/drm_syncobj.c
+@@ -126,7 +126,7 @@ out:
+ bool wlr_drm_syncobj_timeline_check(struct wlr_drm_syncobj_timeline *timeline,
+ uint64_t point, uint32_t flags, bool *result) {
+ int etime;
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ etime = ETIMEDOUT;
+ #else
+ etime = ETIME;
Index: patches/patch-render_vulkan_vulkan_c
===================================================================
RCS file: /local/cvs/ports/wayland/wlroots/patches/patch-render_vulkan_vulkan_c,v
diff -u -p -u -r1.1 patch-render_vulkan_vulkan_c
--- patches/patch-render_vulkan_vulkan_c 25 Nov 2023 11:16:14 -0000 1.1
+++ patches/patch-render_vulkan_vulkan_c 5 Nov 2024 16:40:55 -0000
@@ -4,8 +4,8 @@ Index: render/vulkan/vulkan.c
--- render/vulkan/vulkan.c.orig
+++ render/vulkan/vulkan.c
@@ -1,4 +1,4 @@
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
- #define _POSIX_C_SOURCE 200809L
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__)
+ #undef _POSIX_C_SOURCE