wayland/weston upgrades
v2 cover wayland/weston upgrades
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 and that we'll need to pull xcb-util-cursor from meta-openembedded as it's needed here for weston's ptest now.
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} | 11 +++--
.../xorg-lib/xcb-util-cursor_0.1.4.bb | 10 +++++
...{xwayland_23.1.1.bb => xwayland_23.1.2.bb} | 2 +-
5 files changed, 20 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} (90%)
create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb
rename meta/recipes-graphics/xwayland/{xwayland_23.1.1.bb => xwayland_23.1.2.bb} (95%)Signature · 1 line
2.34.1
PATCH v2 1/3 wayland-utils: Upgrade 1.1.0 -> 1.2.0
---
...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%)meta/recipes-graphics/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch deleted +0 -42
@@ -1,42 +0,0 @@ -From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <[email protected]> -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 <[email protected]> -Fixes: 240cb739 - "Add support for linux_dmabuf version 4" -Reviewed-by: Simon Ser <[email protected]> -Reviewed-by: Pekka Paalanen <[email protected]> - -Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - 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
meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb renamed from meta/recipes-graphics/wayland/wayland-utils_1.1.0.bb +1 -2
@@ -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"
Signature · 1 line
2.34.1
PATCH v2 2/3 weston: Upgrade 11.0.1 -> 12.0.1
In reply to Eilís 'pidge' Ní FhlannagáinTracking https://gitlab.freedesktop.org/wayland/weston/-/issues/488
we're keeping -Ddeprecated-launcher-logind but plans should be made to remove this/work around.
We also need to add xcb-util-cursor from meta-openembedded as this is now required for ptest. When this is pulled we can remove from meta-oe.
---
.../wayland/{weston_11.0.1.bb => weston_12.0.1.bb} | 11 ++++++++---
.../xorg-lib/xcb-util-cursor_0.1.4.bb | 10 ++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/wayland/{weston_11.0.1.bb => weston_12.0.1.bb} (90%)
create mode 100644 meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bbmeta/recipes-graphics/wayland/weston_12.0.1.bb renamed from meta/recipes-graphics/wayland/weston_11.0.1.bb +8 -3
@@ -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+)"
@@ -26,6 +26,7 @@ require ${THISDIR}/required-distro-features.inc DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' xcb-util-cursor xcb-util ', '', d)}" LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
@@ -71,13 +72,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
meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb new file +10 -0
@@ -0,0 +1,10 @@ +require recipes-graphics/xorg-lib/xcb-util.inc + +SUMMARY = "XCB port of libXcursor" + +DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974" + +SRC_URI[sha256sum] = "28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb"
Signature · 1 line
2.34.1
Re: [OE-core] [PATCH v2 2/3] weston: Upgrade 11.0.1 -> 12.0.1
Hello Eilís,
Quoted 11 lines · On Thu, 22 Jun 2023 15:42:16 +0100 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.We also need to add xcb-util-cursor from meta-openembedded as this is now required for ptest. When this is pulled we can remove from meta-oe.
Signed-off-by Eilís 'pidge' Ní Fhlannagáin <[email protected]>--- .../wayland/{weston_11.0.1.bb => weston_12.0.1.bb} | 11 ++++++++--- .../xorg-lib/xcb-util-cursor_0.1.4.bb | 10 ++++++++++
This is triggering failures on no-x11 builds:
stdio: ERROR: Nothing PROVIDES 'xcb-util' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb DEPENDS on or otherwise requires it)
stdio: ERROR: Nothing PROVIDES 'xcb-util-cursor' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb DEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb, /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston-init.bb, /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb RDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-init' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb, /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston-init.bb, /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb RDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-dev' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb RDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-init-dev' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston-init.bb RDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-examples' (but /home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bb RDEPENDS on or otherwise requires it)
Full logs:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/7354/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/7354/steps/15/logs/stdio
Patch "weston: Cleanup and fix x11 and xwayland dependencies"
(https://lore.kernel.org/openembedded-core/[email protected]/T/#u)
was sent a few hours after yours by Tom (in Cc:). Do think it could fix this error? FYI I'm running a new test build with Tom's patch and without this series.
Additionally a new recipe in core needs a maintainer, and as such it is warning:
WARNING: xcb-util-cursor-0.1.4-r0 do_fetch: QA Issue: Recipe xcb-util-cursor in /home/pokybuild/yocto-worker/a-full/build/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb does not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc. [missing-metadata]
Full log:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5511/steps/13/logs/stdio
Luca
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH v2 2/3] weston: Upgrade 11.0.1 -> 12.0.1
Quoted 29 lines · Luca Ceresoli
Hello Eilís,
Quoted 11 lines · On Thu, 22 Jun 2023 15:42:16 +0100 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.We also need to add xcb-util-cursor from meta-openembedded as this is now required for ptest. When this is pulled we can remove from meta-oe.
Signed-off-by Eilís 'pidge' Ní Fhlannagáin <[email protected]>--- .../wayland/{weston_11.0.1.bb => weston_12.0.1.bb} | 11 ++++++++--- .../xorg-lib/xcb-util-cursor_0.1.4.bb | 10 ++++++++++This is triggering failures on no-x11 builds:
stdio: ERROR: Nothing PROVIDES 'xcb-util' (but
/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bbDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing PROVIDES 'xcb-util-cursor' (but/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bbDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston' (but/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb,/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston-init.bb,/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bbRDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-init' (but/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bb,/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston-init.bb,/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bbRDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-dev' (but/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston_12.0.1.bbRDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-init-dev' (but/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/wayland/weston-init.bbRDEPENDS on or otherwise requires it)
stdio: ERROR: Nothing RPROVIDES 'weston-examples' (but/home/pokybuild/yocto-worker/no-x11/build/meta/recipes-graphics/packagegroups/packagegroup-core-weston.bbRDEPENDS on or otherwise requires it)Full logs:
Quoted 8 lines
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/7354/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/7354/steps/15/logs/stdioPatch "weston: Cleanup and fix x11 and xwayland dependencies"
(https://lore.kernel.org/openembedded-core/[email protected]/T/#u)
was sent a few hours after yours by Tom (in Cc:). Do think it could fix this error? FYI I'm running a new test build with Tom's patch and without this series.
No, but it does point to where I think the issue is. Specifically, the DEPENDS for ptest was incorrect, in that it pulls xcb-util for ptest, even if we're doing a no-x11 build. I need to see what ptest does for no-x11 if xcb-util doesn't exist and rework based on that. I'll have a v3 early next week.
Quoted 6 lines
Additionally a new recipe in core needs a maintainer, and as such it is warning:
WARNING: xcb-util-cursor-0.1.4-r0
do_fetch: QA Issue: Recipe xcb-util-cursor in/home/pokybuild/yocto-worker/a-full/build/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bbdoes not have an assigned maintainer. Please add an entry into meta/conf/distro/include/maintainers.inc. [missing-metadata]
I'll add that in v3 and take maintainership.
Quoted 5 lines
Full log:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5511/steps/13/logs/stdioLuca
Signature · 3 lines
Eilís 'pidge' Ní Fhlannagáin BayLibre - At the Heart of Embedded Linux www.baylibre.com
PATCH v2 3/3 xwayland: Upgrade 23.1.1 -> 23.1.2
In reply to Eilís 'pidge' Ní Fhlannagáin---
.../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%)meta/recipes-graphics/xwayland/xwayland_23.1.2.bb renamed from meta/recipes-graphics/xwayland/xwayland_23.1.1.bb +1 -1
@@ -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"
Signature · 1 line
2.34.1
Hello Eilís,
Quoted 2 lines · On Thu, 22 Jun 2023 15:42:14 +0100 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
Should we file a bug in bugzilla to avoid forgetting about this?
Luca
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 9 lines · Luca Ceresoli
Hello Eilís,
Quoted 2 lines · On Thu, 22 Jun 2023 15:42:14 +0100 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
Should we file a bug in bugzilla to avoid forgetting about this?
Yes, I'll assign it to myself. Alex had suggested we just require seatd which to me makes the most sense.
-e
Quoted 3 lines
Luca
Signature · 3 lines
Eilís 'pidge' Ní Fhlannagáin BayLibre - At the Heart of Embedded Linux www.baylibre.com
Hello Eilís,
Quoted 6 lines · On Fri, 23 Jun 2023 11:21:29 +0100 Eilís 'pidge' Ní Fhlannagáin…
Quoted 5 lines · Luca Ceresoli
Hello Eilís,
On Thu, 22 Jun 2023 15:42:14 +0100
Eilís 'pidge' Ní Fhlannagáin <[email protected]> wrote:
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
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
Should we file a bug in bugzilla to avoid forgetting about this?
Yes, I'll assign it to myself. Alex had suggested we just require seatd which to me makes the most sense.
OK, so it I guess you should add it as soon as a future version of this series is accepted, unless you have managed to handle this properly by then.
Luca
Signature · 3 lines
Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
I have meanwhile been addressing all these issues in parallel with pidge. There's a patch here:
https://git.yoctoproject.org/poky-contrib/log/?h=akanavin/package-version-updates
and it doesn't show issues in a-full. If you''re pressed for time, I can simply submit my version when the whole patchset is ready.
Alex
Quoted 39 lines · Luca Ceresoli via lists.openembedded.org
Hello Eilís,
Quoted 6 lines · On Fri, 23 Jun 2023 11:21:29 +0100 Eilís 'pidge' Ní Fhlannagáin…
Quoted 5 lines · Luca Ceresoli
Hello Eilís,
On Thu, 22 Jun 2023 15:42:14 +0100
Eilís 'pidge' Ní Fhlannagáin <[email protected]> wrote:Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
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
Should we file a bug in bugzilla to avoid forgetting about this?
Yes, I'll assign it to myself. Alex had suggested we just require seatd which to me makes the most sense.
OK, so it I guess you should add it as soon as a future version of this series is accepted, unless you have managed to handle this properly by then.
Luca
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#183319): https://lists.openembedded.org/g/openembedded-core/message/183319
Mute This Topic: https://lists.openembedded.org/mt/99702158/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-