[PATCH 0/3] wayland/weston upgrades

[PATCH 0/3] wayland/weston upgrades

[Eilís 'pidge' Ní Fhlannagáin]

Nothing really surprising here, except we should note that launcher-logind is 
being depreciated so some thought on how that is dealt with will need to occur.

Eilís 'pidge' Ní Fhlannagáin (3):
  wayland-utils: upgrade 1.1.0 -> 1.2.0
  weston: Upgrade 11.0.1 -> 12.0.1
  xwayland: Upgrade 23.1.1 -> 23.1.2

 ...ayland-info-Fix-build-without-libdrm.patch | 42 -------------------
 ...-utils_1.1.0.bb => wayland-utils_1.2.0.bb} |  3 +-
 .../{weston_11.0.1.bb => weston_12.0.1.bb}    | 10 +++--
 ...{xwayland_23.1.1.bb => xwayland_23.1.2.bb} |  2 +-
 4 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
 rename meta/recipes-graphics/wayland/{wayland-utils_1.1.0.bb => wayland-utils_1.2.0.bb} (82%)
 rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (92%)
 rename meta/recipes-graphics/xwayland/{xwayland_23.1.1.bb => xwayland_23.1.2.bb} (95%)

-- 
2.34.1

[PATCH 1/3] wayland-utils: upgrade 1.1.0 -> 1.2.0

[Eilís 'pidge' Ní Fhlannagáin]

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
---
 ...ayland-info-Fix-build-without-libdrm.patch | 42 -------------------
 ...-utils_1.1.0.bb => wayland-utils_1.2.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
 rename meta/recipes-graphics/wayland/{wayland-utils_1.1.0.bb => wayland-utils_1.2.0.bb} (82%)

diff --git a/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch b/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
deleted file mode 100644
index 86c44d4480..0000000000
--- a/meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Wed, 14 Sep 2022 09:07:10 +0200
-Subject: [PATCH] wayland-info: Fix build without libdrm
-
-wayland-info can optionally use libdrm to provide a description of the
-dmabuf format modifiers.
-
-When not using libdrm however, the build fails because "dev_t" is not
-defined.
-
-The definition of "dev_t" comes from <sys/types.h> which is included
-from <libdrm.h>, which is not included without libdrm support, hence the
-build failure.
-
-Simply include <sys/types.h> unconditionally to make sure "dev_t" is
-defined regardless of libdrm support, to fix the build failure.
-
-Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Fixes: 240cb739 - "Add support for linux_dmabuf version 4"
-Reviewed-by: Simon Ser <contact@emersion.fr>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- wayland-info/wayland-info.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c
-index 53cd04b..98ff205 100644
---- a/wayland-info/wayland-info.c
-+++ b/wayland-info/wayland-info.c
-@@ -34,6 +34,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
- 
- #include <wayland-client.h>
- #if HAVE_HUMAN_FORMAT_MODIFIER
diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb
similarity index 82%
rename from meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb
rename to meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb
index dcee87e2cd..16a5dc072c 100644
--- a/meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb
+++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \
                    "
 
 SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
-           file://0001-wayland-info-Fix-build-without-libdrm.patch \
            "
-SRC_URI[sha256sum] = "9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a"
+SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 
-- 
2.34.1

[PATCH 2/3] weston: Upgrade 11.0.1 -> 12.0.1

[Eilís 'pidge' Ní Fhlannagáin]

Tracking https://gitlab.freedesktop.org/wayland/weston/-/issues/488
we're keeping -Ddeprecated-launcher-logind but plans should be made to
remove this/work around.

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
---
 .../wayland/{weston_11.0.1.bb => weston_12.0.1.bb}     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (92%)

diff --git a/meta/recipes-graphics/wayland/weston_11.0.1.bb b/meta/recipes-graphics/wayland/weston_12.0.1.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/weston_11.0.1.bb
rename to meta/recipes-graphics/wayland/weston_12.0.1.bb
index 4f6ce19915..be9dae6289 100644
--- a/meta/recipes-graphics/wayland/weston_11.0.1.bb
+++ b/meta/recipes-graphics/wayland/weston_12.0.1.bb
@@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                     file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
                     "
 
-SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \
+SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/12.0.1/downloads/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
            file://xwayland.weston-start \
            file://systemd-notify.weston-start \
            "
 
-SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57"
+SRC_URI[sha256sum] = "b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@@ -71,13 +71,17 @@ PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=fals
 # Weston with webp support
 PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
 # Weston with systemd-login support
-PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus"
+PACKAGECONFIG[systemd] = "-Dsystemd=true -Ddeprecated-launcher-logind=true,-Dsystemd=false -Ddeprecated-launcher-logind=false,systemd dbus"
 # Weston with Xwayland support (requires X11 and Wayland)
 PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland"
 # colord CMS support
 PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
 # Clients support
 PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
+# Pipewire support
+PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false, pipewire"
+# neatvnc support
+PACKAGECONFIG[neatvnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false, neatvnc"
 # Virtual remote output with GStreamer on DRM backend
 PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
 # Weston with screen-share support
-- 
2.34.1

Re: [OE-core] [PATCH 2/3] weston: Upgrade 11.0.1 -> 12.0.1

[Alexander Kanavin]

There's already:
PACKAGECONFIG[launcher-libseat] =
"-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" used in
sysvinit builds,
and oe-core has the seatd recipe. So this could simply become a hard
dependency later on.

Alex

On Thu, 15 Jun 2023 at 21:23, Eilís 'pidge' Ní Fhlannagáin
<pidge@baylibre.com> wrote:
>
> Tracking https://gitlab.freedesktop.org/wayland/weston/-/issues/488
> we're keeping -Ddeprecated-launcher-logind but plans should be made to
> remove this/work around.
>
> Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
> ---
>  .../wayland/{weston_11.0.1.bb => weston_12.0.1.bb}     | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>  rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (92%)
>
> diff --git a/meta/recipes-graphics/wayland/weston_11.0.1.bb b/meta/recipes-graphics/wayland/weston_12.0.1.bb
> similarity index 92%
> rename from meta/recipes-graphics/wayland/weston_11.0.1.bb
> rename to meta/recipes-graphics/wayland/weston_12.0.1.bb
> index 4f6ce19915..be9dae6289 100644
> --- a/meta/recipes-graphics/wayland/weston_11.0.1.bb
> +++ b/meta/recipes-graphics/wayland/weston_12.0.1.bb
> @@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
>                      file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
>                      "
>
> -SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \
> +SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/12.0.1/downloads/${BPN}-${PV}.tar.xz \
>             file://weston.png \
>             file://weston.desktop \
>             file://xwayland.weston-start \
>             file://systemd-notify.weston-start \
>             "
>
> -SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57"
> +SRC_URI[sha256sum] = "b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535"
>
>  UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
>  UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
> @@ -71,13 +71,17 @@ PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=fals
>  # Weston with webp support
>  PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
>  # Weston with systemd-login support
> -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus"
> +PACKAGECONFIG[systemd] = "-Dsystemd=true -Ddeprecated-launcher-logind=true,-Dsystemd=false -Ddeprecated-launcher-logind=false,systemd dbus"
>  # Weston with Xwayland support (requires X11 and Wayland)
>  PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland"
>  # colord CMS support
>  PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
>  # Clients support
>  PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
> +# Pipewire support
> +PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false, pipewire"
> +# neatvnc support
> +PACKAGECONFIG[neatvnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false, neatvnc"
>  # Virtual remote output with GStreamer on DRM backend
>  PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
>  # Weston with screen-share support
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#182869): https://lists.openembedded.org/g/openembedded-core/message/182869
> Mute This Topic: https://lists.openembedded.org/mt/99556213/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

[PATCH 3/3] xwayland: Upgrade 23.1.1 -> 23.1.2

[Eilís 'pidge' Ní Fhlannagáin]

Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <pidge@baylibre.com>
---
 .../xwayland/{xwayland_23.1.1.bb => xwayland_23.1.2.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xwayland/{xwayland_23.1.1.bb => xwayland_23.1.2.bb} (95%)

diff --git a/meta/recipes-graphics/xwayland/xwayland_23.1.1.bb b/meta/recipes-graphics/xwayland/xwayland_23.1.2.bb
similarity index 95%
rename from meta/recipes-graphics/xwayland/xwayland_23.1.1.bb
rename to meta/recipes-graphics/xwayland/xwayland_23.1.2.bb
index a065e92f01..de516536d1 100644
--- a/meta/recipes-graphics/xwayland/xwayland_23.1.1.bb
+++ b/meta/recipes-graphics/xwayland/xwayland_23.1.2.bb
@@ -10,7 +10,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
 
 SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
-SRC_URI[sha256sum] = "fb9461f5cb9fea5e07e91882311b0c88b43e8843b017ebac05eb5af69aa34c15"
+SRC_URI[sha256sum] = "bd25d8498ee4d77874fda125127e2db37fc332531febc966231ea06fae8cf77f"
 
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
 
-- 
2.34.1

Re: [OE-core] [PATCH 0/3] wayland/weston upgrades

[Richard Purdie]

On Thu, 2023-06-15 at 20:20 +0100, Eilís 'pidge' Ní Fhlannagáin wrote:
> Nothing really surprising here, except we should note that launcher-logind is 
> being depreciated so some thought on how that is dealt with will need to occur.
> 
> Eilís 'pidge' Ní Fhlannagáin (3):
>   wayland-utils: upgrade 1.1.0 -> 1.2.0
>   weston: Upgrade 11.0.1 -> 12.0.1
>   xwayland: Upgrade 23.1.1 -> 23.1.2
> 
>  ...ayland-info-Fix-build-without-libdrm.patch | 42 -------------------
>  ...-utils_1.1.0.bb => wayland-utils_1.2.0.bb} |  3 +-
>  .../{weston_11.0.1.bb => weston_12.0.1.bb}    | 10 +++--
>  ...{xwayland_23.1.1.bb => xwayland_23.1.2.bb} |  2 +-
>  4 files changed, 9 insertions(+), 48 deletions(-)
>  delete mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
>  rename meta/recipes-graphics/wayland/{wayland-utils_1.1.0.bb => wayland-utils_1.2.0.bb} (82%)
>  rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (92%)
>  rename meta/recipes-graphics/xwayland/{xwayland_23.1.1.bb => xwayland_23.1.2.bb} (95%)

Thanks for these. Unfortunately there is a bit more work needed as I
think you didn't have ptests enabled:

https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/7200/steps/11/logs/stdio

| Dependency xcb found: YES 1.15 (cached)
| Run-time dependency xcb-cursor found: NO (tried pkgconfig and cmake)
| 
| ../weston-12.0.1/tests/meson.build:317:2: ERROR: Problem encountered:
xcb and xcb-cursor required for running xwayland tests

which happened on musl and a load of other places in the parent build.

Cheers,

Richard

Re: [OE-core] [PATCH 0/3] wayland/weston upgrades

[Eilís 'pidge' Ní Fhlannagáin]

On 16/06/2023 08:31, Richard Purdie wrote:
> On Thu, 2023-06-15 at 20:20 +0100, Eilís 'pidge' Ní Fhlannagáin wrote:
>> Nothing really surprising here, except we should note that launcher-logind is
>> being depreciated so some thought on how that is dealt with will need to occur.
>>
>> Eilís 'pidge' Ní Fhlannagáin (3):
>>    wayland-utils: upgrade 1.1.0 -> 1.2.0
>>    weston: Upgrade 11.0.1 -> 12.0.1
>>    xwayland: Upgrade 23.1.1 -> 23.1.2
>>
>>   ...ayland-info-Fix-build-without-libdrm.patch | 42 -------------------
>>   ...-utils_1.1.0.bb => wayland-utils_1.2.0.bb} |  3 +-
>>   .../{weston_11.0.1.bb => weston_12.0.1.bb}    | 10 +++--
>>   ...{xwayland_23.1.1.bb => xwayland_23.1.2.bb} |  2 +-
>>   4 files changed, 9 insertions(+), 48 deletions(-)
>>   delete mode 100644 meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch
>>   rename meta/recipes-graphics/wayland/{wayland-utils_1.1.0.bb => wayland-utils_1.2.0.bb} (82%)
>>   rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (92%)
>>   rename meta/recipes-graphics/xwayland/{xwayland_23.1.1.bb => xwayland_23.1.2.bb} (95%)
> 
> Thanks for these. Unfortunately there is a bit more work needed as I
> think you didn't have ptests enabled:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/7200/steps/11/logs/stdio
> 
> | Dependency xcb found: YES 1.15 (cached)
> | Run-time dependency xcb-cursor found: NO (tried pkgconfig and cmake)
> |
> | ../weston-12.0.1/tests/meson.build:317:2: ERROR: Problem encountered:
> xcb and xcb-cursor required for running xwayland tests
> 
> which happened on musl and a load of other places in the parent build.

Thanks RP, I'll look today.

> 
> Cheers,
> 
> Richard

-- 
Eilís 'pidge' Ní Fhlannagáin
BayLibre - At the Heart of Embedded Linux
www.baylibre.com