From: yaydn@protonmail.com
Subject: Re: [update] wayland/wayland 1.24.0
To: Matthieu Herrb <matthieu@herrb.eu>
Cc: "ports@openbsd.org" <ports@openbsd.org>
Date: Wed, 30 Jul 2025 20:51:34 +0000

På tirsdag 29. juli 2025 kl. 15:18, Matthieu Herrb
<matthieu@herrb.eu> skrev:

> On Wed, Jul 16, 2025 at 10:46:54PM +0000, yaydn@protonmail.com wrote:
>
> > Hello everyone,
> >
> > Here is wayland 1.24.0. I have been testing 1.23.93(rc3) on
> > current/amd64 for a few weeks which is near identical to 1.24.0.
> > Additionally, I have run 1.24.0 itself for nearly two weeks. Looks fine.
> >
> > I waited for various updates in ports and base to settle before
> > proposing to reduce conflicts and fallout. I haven't had issues so far.
> >
> > I rebuilt kde-plasma, wayland/* and see no obvious problems, so I hope
> > this will be clean update.
> >
> > Thank you @matthieu for pushing the previously needed patch upstream.
> >
> > Here is the changelog:
> >
> > https://lore.freedesktop.org/wayland-devel/plU5smxin5VXbiedTGtL7CNHe0t2mHtgQlQ3-xwREmSSNYaClAcZpEBV8L7JvMT8JHwdD_a_uSFkDUaP45CAWyL545iZh5gInAdToX6hgt4=@emersion.fr/T/#u
> >
> > I made this with
> >
> > cd /usr/ports/wayland/wayland/ && cvs diff -uNp > wayland-1.24.0.patch
> >
> > and should be applied somewhat like this? (I attached a copy of the
> > the patch for convenience)
> >
> > cd /usr/ports/wayland/wayland/ && patch -l -p0 -E < wayland-1.24.0.patch
> >
> > Is this acceptable? Comments, advice, and testing welcome. Thank you.
>
>
> There have been some symbols added to libwayland-client and
> libwayland-server. So minor bumps are needed. Other than that I think
> my patch is the same.
>


Tested on current/amd64.

Ah, I was not sure if the symbols should be bumped.

Makes sense, thank you.

Did:

cd /usr/ports/wayland/wayland/ && patch -l -p0 -E < /tmp/wayland-1.24.patch
cd /usr/ports/wayland/wayland/ && make clean=all clean
cd /usr/ports/wayland/wayland/ && make update clean && make distclean

Looks good, your upstream patches really make this a smooth update.

Take care, well wishes everyone, and felicitous porting!


> Index: Makefile
> ===================================================================
> RCS file: /local/cvs/ports/wayland/wayland/Makefile,v
> diff -u -p -u -r1.11 Makefile
> --- Makefile 1 Nov 2024 10:42:05 -0000 1.11
> +++ Makefile 29 Jul 2025 13:16:39 -0000
> @@ -1,16 +1,16 @@
> COMMENT = Display server protocol
>
> DISTNAME = wayland-${V}
> -V = 1.23.1
> +V = 1.24.0
>
> CATEGORIES = wayland
>
> HOMEPAGE = https://wayland.freedesktop.org/
>
> -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.3 # 0.21.0
> +SHARED_LIBS += wayland-client 0.3 # 0.24.0
> +SHARED_LIBS += wayland-cursor 0.0 # 0.24.0
> +SHARED_LIBS += wayland-egl 0.0 # 1.24.0
> +SHARED_LIBS += wayland-server 0.4 # 0.24.0
>
> WANTLIB += c epoll-shim expat ffi xml2
>
> Index: distinfo
> ===================================================================
> RCS file: /local/cvs/ports/wayland/wayland/distinfo,v
> diff -u -p -u -r1.5 distinfo
> --- distinfo 1 Nov 2024 10:42:05 -0000 1.5
> +++ distinfo 29 Jul 2025 13:16:39 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (wayland-1.23.1.tar.xz) = hk+yqDmeLQ7DnVbp2bdTwJN3W+rcYCLOgfRBkpqB5e0=
> -SIZE (wayland-1.23.1.tar.xz) = 238212
> +SHA256 (wayland-1.24.0.tar.xz) = gokkh6Aa1nszTsqDtUMXp8hqA6ic+trP71IR8RpdBTY=
> +SIZE (wayland-1.24.0.tar.xz) = 241764
> Index: patches/patch-src_wayland-util_h
> ===================================================================
> RCS file: patches/patch-src_wayland-util_h
> diff -N patches/patch-src_wayland-util_h
> --- patches/patch-src_wayland-util_h 1 Nov 2024 10:42:05 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -Index: src/wayland-util.h
> ---- src/wayland-util.h.orig
> -+++ src/wayland-util.h
> -@@ -48,7 +48,8 @@ extern "C" {
> - #endif
> -
> - /** Deprecated attribute */
> --#if STDC_VERSION >= 202311L
>
> -+#if defined(STDC_VERSION) && STDC_VERSION >= 202311L \
>
> -+ || defined(__cplusplus) && __cplusplus >= 201402L
>
> - #define WL_DEPRECATED [[deprecated]]
> - #elif defined(GNUC) && GNUC >= 4
>
> - #define WL_DEPRECATED attribute ((deprecated))
> -@@ -70,7 +71,7 @@ extern "C" {
> - #define WL_PRINTF(x, y)
> - #endif
> -
> --#if STDC_VERSION >= 202311L
>
> -+#if defined(STDC_VERSION) && STDC_VERSION >= 202311L
>
> - #define WL_TYPEOF(expr) typeof(expr)
> - #else
> - #define WL_TYPEOF(expr) typeof(expr)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /local/cvs/ports/wayland/wayland/pkg/PLIST,v
> diff -u -p -u -r1.3 PLIST
> --- pkg/PLIST 19 Aug 2022 06:39:55 -0000 1.3
> +++ pkg/PLIST 29 Jul 2025 13:16:39 -0000
> @@ -21,6 +21,7 @@ lib/pkgconfig/wayland-egl-backend.pc
> lib/pkgconfig/wayland-egl.pc
> lib/pkgconfig/wayland-scanner.pc
> lib/pkgconfig/wayland-server.pc
> +share/aclocal/
> share/aclocal/wayland-scanner.m4
> share/wayland/
> share/wayland/wayland-scanner.mk
>
> --
> Matthieu Herrb