Re: update: wayland-1.23.0

On Sun, Aug 25, 2024 at 10:21:39AM +0200, Matthieu Herrb wrote:
> On Fri, Aug 16, 2024 at 03:26:29PM +0200, Matthieu Herrb wrote:
> > Hi,
> >
> > The patch below is a trivial update to wayland-1.23.0. All patches
> > have been merged upstreams.
> >
> And now, update to wayland 1.23.1, with proper shared libraries bumps.
>
> comments, ok ?

This didn't make it to 7.6. ping ?

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/wayland/wayland/Makefile,v
> diff -u -p -u -r1.10 Makefile
> --- Makefile 27 Sep 2023 18:13:48 -0000 1.10
> +++ Makefile 25 Aug 2024 08:20:54 -0000
> @@ -1,17 +1,16 @@
> COMMENT = Display server protocol
>
> DISTNAME = wayland-${V}
> -V = 1.22.0
> -REVISION = 0
> +V = 1.23.1
>
> CATEGORIES = wayland
>
> HOMEPAGE = https://wayland.freedesktop.org/
>
> -SHARED_LIBS += wayland-client 0.1 # 0.21.0
> +SHARED_LIBS += wayland-client 0.2 # 0.21.0
> SHARED_LIBS += wayland-cursor 0.0 # 0.21.0
> SHARED_LIBS += wayland-egl 0.0 # 1.0
> -SHARED_LIBS += wayland-server 0.2 # 0.21.0
> +SHARED_LIBS += wayland-server 0.3 # 0.21.0
>
> WANTLIB += c epoll-shim expat ffi xml2
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/wayland/wayland/distinfo,v
> diff -u -p -u -r1.4 distinfo
> --- distinfo 5 Jul 2023 13:37:54 -0000 1.4
> +++ distinfo 25 Aug 2024 08:20:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (wayland-1.22.0.tar.xz) = FUCvHqaYpHHC2OnSiDMsfg/TYMjx0Sk267fny8JCWEI=
> -SIZE (wayland-1.22.0.tar.xz) = 229544
> +SHA256 (wayland-1.23.1.tar.xz) = hk+yqDmeLQ7DnVbp2bdTwJN3W+rcYCLOgfRBkpqB5e0=
> +SIZE (wayland-1.23.1.tar.xz) = 238212
> Index: patches/patch-egl_meson_build
> ===================================================================
> RCS file: patches/patch-egl_meson_build
> diff -N patches/patch-egl_meson_build
> --- patches/patch-egl_meson_build 19 Aug 2022 06:39:55 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256
> -
> -Index: egl/meson.build
> ---- egl/meson.build.orig
> -+++ egl/meson.build
> -@@ -11,7 +11,7 @@ wayland_egl = library(
> -
> - executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c')
> -
> --nm_path = find_program('nm').full_path()
> -+nm_path = find_program(['llvm-nm', 'nm']).full_path()
> -
> - test(
> - 'wayland-egl symbols check',
> Index: patches/patch-meson_build
> ===================================================================
> RCS file: patches/patch-meson_build
> diff -N patches/patch-meson_build
> --- patches/patch-meson_build 19 Aug 2022 06:39:55 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256
> -
> -Index: meson.build
> ---- meson.build.orig
> -+++ meson.build
> -@@ -16,7 +16,7 @@ config_h.set_quoted('PACKAGE', meson.project_name())
> - config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
> -
> - cc_args = []
> --if host_machine.system() != 'freebsd'
> -+if host_machine.system() not in ['freebsd', 'openbsd']
> - cc_args += ['-D_POSIX_C_SOURCE=200809L']
> - endif
> - add_project_arguments(cc_args, language: 'c')
> -@@ -69,7 +69,7 @@ endif
> - config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec)
> -
> - if get_option('libraries')
> -- if host_machine.system() == 'freebsd'
> -+ if host_machine.system() in ['freebsd', 'openbsd']
> - # When building for FreeBSD, epoll(7) is provided by a userspace
> - # wrapper around kqueue(2).
> - epoll_dep = dependency('epoll-shim')
> Index: patches/patch-src_wayland-os_c
> ===================================================================
> RCS file: patches/patch-src_wayland-os_c
> diff -N patches/patch-src_wayland-os_c
> --- patches/patch-src_wayland-os_c 19 Aug 2022 06:39:55 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/256
> -
> -Index: src/wayland-os.c
> ---- src/wayland-os.c.orig
> -+++ src/wayland-os.c
> -@@ -105,7 +105,11 @@ int
> - wl_os_socket_peercred(int sockfd, uid_t *uid, gid_t *gid, pid_t *pid)
> - {
> - socklen_t len;
> -+#if defined(__OpenBSD__)
> -+ struct sockpeercred ucred;
> -+#else
> - struct ucred ucred;
> -+