Weston 15.0.0 upgrade
cover Weston 15.0.0 upgrade
Per discussion on the dev call this past week, here's an upgrade of the Weston recipe to the recent 15.0.0 release to hopefully make M3. I have successfully tested core-image-weston on all the QEMU platforms, and I believe the couple of failures I saw in my local selftests are explainable (e.g. the tarball not being in YP's download cache).
Note that I have left the now deprecated fullscreen-shell and screen-share options in PACkAGECONFIG to avoid causing issues this close to feature freeze. I think it would make sense to take them out of the default options post-LTS and consider removing the RDP example from weston.ini (or replacing it with e.g. VNC).
Best rregards,
Scott
Changes:
Scott Murray (1):
weston: update to 15.0.0
.../wayland/weston-init/weston.ini | 2 +-
...d-drm-meson.build-allow-libdisplay-i.patch | 28 -------------------
.../{weston_14.0.2.bb => weston_15.0.0.bb} | 17 +++++++----
3 files changed, 12 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch
rename meta/recipes-graphics/wayland/{weston_14.0.2.bb => weston_15.0.0.bb} (88%)Signature · 1 line
2.51.0
PATCH 1/1 u-boot: move CVE patch out of u-boot-common.inc
Commit f5b980ad added CVE-2024-42040.patch to the base U-Boot SRC_URI in u-boot-common.inc as opposed to adding it in the u-boot recipe where all the other patch additions are. This breaks at least one downstream BSP that reuses u-boot-common.inc (meta-sifive), so move that patch addition to the recipe file with all the others.
--- meta/recipes-bsp/u-boot/u-boot-common.inc | 4 +--- meta/recipes-bsp/u-boot/u-boot_2022.01.bb | 1 + 2 files changed, 2 insertions(+), 3 deletions(-)
meta/recipes-bsp/u-boot/u-boot-common.inc +1 -3
@@ -14,9 +14,7 @@ PE = "1" # repo during parse SRCREV = "d637294e264adfeb29f390dfc393106fd4d41b17" -SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master \ - file://CVE-2024-42040.patch \ -" +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" S = "${WORKDIR}/git" B = "${WORKDIR}/build"
meta/recipes-bsp/u-boot/u-boot_2022.01.bb +1 -0
@@ -11,6 +11,7 @@ SRC_URI += " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \ file://CVE-2022-30790.patch \ file://CVE-2022-2347_1.patch \ file://CVE-2022-2347_2.patch \ + file://CVE-2024-42040.patch \ file://CVE-2024-57254.patch \ file://CVE-2024-57255.patch \ file://CVE-2024-57256.patch \
Signature · 1 line
2.51.0
PATCH 1/1 weston: update to 15.0.0
In reply to Scott MurrayAnnouncement:
https://lore.freedesktop.org/wayland-devel/aZbDU-xtVMLhB0wD@xpredator/
Functional changes:
- New Vulkan renderer. A "vulkan" PACKAGECONFIG option has been added to enable building it, and it is enabled if "vulkan" is present in DISTRO_FEATURES, similar to how X11 and Wayland are handled.
- New Lua shell. A "lua-shell" PACkAGECONFIG option has been added to enable building it, but it has not been enabled by defsult to avoid affecting build times.
- Fullscreen shell and screen-share module marked as deprecated. Their PACKAGECONFIG options have been updated to still work, but have not been renamed to avoid breaking working configurations.
- Perfetto support. A "perfetto" PACKAGECONFIG option has been added to enable building it, but it is not on by default due to meta-oe being required to build.
- The "client-no-resize" option for the RDP backend has been replaced with "resizeable/no-resizeable" to match the VNC backend. The example in weston.ini has been updated.
---
.../wayland/weston-init/weston.ini | 2 +-
...d-drm-meson.build-allow-libdisplay-i.patch | 28 -------------------
.../{weston_14.0.2.bb => weston_15.0.0.bb} | 17 +++++++----
3 files changed, 12 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch
rename meta/recipes-graphics/wayland/{weston_14.0.2.bb => weston_15.0.0.bb} (88%)meta/recipes-graphics/wayland/weston-init/weston.ini +1 -1
@@ -69,7 +69,7 @@ require-input=false #max_accel_factor = 1.0 [screen-share] -command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-resizeable #[xwayland] #path=/usr/bin/Xwayland
meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From fe8166164170465458561581afd55c325d8e138b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 17 Dec 2025 12:54:20 +0100 -Subject: [PATCH] libweston/backend-drm/meson.build: allow libdisplay-info - 0.3.0 - -The patch in the main branch is against top level meson.build, -so I manually edited in the same tweak in the 14.x codebase. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1815] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - libweston/backend-drm/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build -index 002669e..a8f2ea5 100644 ---- a/libweston/backend-drm/meson.build -+++ b/libweston/backend-drm/meson.build -@@ -4,7 +4,7 @@ endif - - dep_libdisplay_info = dependency( - 'libdisplay-info', -- version: ['>= 0.1.1', '< 0.3.0'], -+ version: ['>= 0.1.1', '< 0.4.0'], - fallback: ['display-info', 'di_dep'], - default_options: [ - 'werror=false',
meta/recipes-graphics/wayland/weston_15.0.0.bb renamed from meta/recipes-graphics/wayland/weston_14.0.2.bb +11 -6
@@ -11,10 +11,9 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://weston.desktop \ file://xwayland.weston-start \ file://systemd-notify.weston-start \ - file://0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch \ " -SRC_URI[sha256sum] = "b47216b3530da76d02a3a1acbf1846a9cd41d24caa86448f9c46f78f20b6e0ac" +SRC_URI[sha256sum] = "58c6186d29a5d2f0be0dec4882af71cc190a11da803f6ed1bf0b2c74120da973" UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@@ -36,7 +35,7 @@ EXTRA_OEMESON += "-Dpipewire=false -Dtests=false" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd vulkan x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ image-jpeg \ screenshare \
@@ -63,9 +62,11 @@ PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on RDP PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp" # VA-API desktop recorder -PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" +PACKAGECONFIG[vaapi] = "-Ddeprecated-backend-drm-screencast-vaapi=true,-Ddeprecated-backend-drm-screencast-vaapi=false,libva" # Weston with EGL support PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" +# Weston with Vulkan support +PACKAGECONFIG[vulkan] = "-Drenderer-vulkan=true,-Drenderer-vulkan=false,glslang-native vulkan-loader vulkan-headers" # Weston with lcms support PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" # Weston with webp support
@@ -79,21 +80,25 @@ PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true, # 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 -PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" +PACKAGECONFIG[screenshare] = "-Ddeprecated-screenshare=true,-Ddeprecated-screenshare=false" # Traditional desktop shell PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" # Fullscreen shell -PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" +PACKAGECONFIG[shell-fullscreen] = "-Ddeprecated-shell-fullscreen=true,-Ddeprecated-shell-fullscreen=false" # In-Vehicle Infotainment (IVI) shell PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" # Kiosk shell PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" +# Lua shell +PACKAGECONFIG[shell-lua] = "-Dshell-lua=true,-Dshell-lua=false,lua" # JPEG image loading support PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" # screencasting via PipeWire PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire,pipewire" # VNC remote screensharing PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam" +# Perfetto performance analysis support +PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto" do_install:append() { # Weston doesn't need the .la files to load modules, so wipe them
Signature · 1 line
2.51.0
Re: [OE-core] [PATCH 1/1] weston: update to 15.0.0
Quoted 21 lines · Scott Murray via lists.openembedded.org
Announcement:
https://lore.freedesktop.org/wayland-devel/aZbDU-xtVMLhB0wD@xpredator/Functional changes:
- New Vulkan renderer. A "vulkan" PACKAGECONFIG option has been added to enable building it, and it is enabled if "vulkan" is present inDISTRO_FEATURES, similar to how X11 and Wayland are handled.
- New Lua shell. A "lua-shell" PACkAGECONFIG option has been added to enable building it, but it has not been enabled by defsult to avoid affecting build times.
- Fullscreen shell and screen-share module marked as deprecated. Their PACKAGECONFIG options have been updated to still work, but have not been renamed to avoid breaking working configurations.
- Perfetto support. A "perfetto" PACKAGECONFIG option has been added to enable building it, but it is not on by default due to meta-oe being required to build.
- The "client-no-resize" option for the RDP backend has been replaced with "resizeable/no-resizeable" to match the VNC backend. The example in weston.ini has been updated.
Quoted 2 lines
Signed-off-by Scott Murray <[email protected]>---
Hi Scott,
Thanks for your patch, and sorry for the delay.
I looks like this is breaking "no-x11" builds. I believe you should be able to reproduce this just with "DISTRO_FEATURES:remove = 'x11'":
ERROR: weston-15.0.0-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/temp/run.do_compile.2505757' failed with exit code 1
...
| FAILED: [code=1] libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o | x86_64-poky-linux-gcc -m64 -march=x86-64-v3 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot -Ilibweston/renderer-vulkan/vulkan-renderer.so.p -Ilibweston/renderer-vulkan -I../sources/weston-15.0.0/libweston/renderer-vulkan -I. -I../sources/weston-15.0.0 -Iinclude -I../sources/weston-15.0.0/include -Ilibweston -I../sources/weston-15.0.0/libweston -Iprotocol -I/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot/usr/include/libdrm -I/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot/usr/include/pixman-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu11 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -g -fcanon-prefix-map -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/sources/weston-15.0.0=/usr/src/debug/weston/15.0.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/build=/usr/src/debug/weston/15.0.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot= -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot-native= -pipe -fPIC -MD -MQ libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o -MF libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o.d -o libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o -c ../sources/weston-15.0.0/libweston/renderer-vulkan/vulkan-pipeline.c | In file included from ../sources/weston-15.0.0/libweston/renderer-vulkan/vulkan-pipeline.c:42: | ../sources/weston-15.0.0/libweston/renderer-vulkan/vulkan-renderer-internal.h:43:10: fatal error: xcb/xcb.h: No such file or directory | 43 | #include <xcb/xcb.h> | | ^~~~~~~~~~~ | compilation terminated. | ninja: build stopped: subcommand failed
https://autobuilder.yoctoproject.org/valkyrie/#/builders/25/builds/3404
Can you have a look at the error?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core] [PATCH 1/1] weston: update to 15.0.0
Quoted 43 lines · Mathieu Dubois-Briand
Quoted 21 lines · Scott Murray via lists.openembedded.org
Announcement:
https://lore.freedesktop.org/wayland-devel/aZbDU-xtVMLhB0wD@xpredator/Functional changes:
- New Vulkan renderer. A "vulkan" PACKAGECONFIG option has been added to enable building it, and it is enabled if "vulkan" is present inDISTRO_FEATURES, similar to how X11 and Wayland are handled.
- New Lua shell. A "lua-shell" PACkAGECONFIG option has been added to enable building it, but it has not been enabled by defsult to avoid affecting build times.
- Fullscreen shell and screen-share module marked as deprecated. Their PACKAGECONFIG options have been updated to still work, but have not been renamed to avoid breaking working configurations.
- Perfetto support. A "perfetto" PACKAGECONFIG option has been added to enable building it, but it is not on by default due to meta-oe being required to build.
- The "client-no-resize" option for the RDP backend has been replaced with "resizeable/no-resizeable" to match the VNC backend. The example in weston.ini has been updated.Quoted 2 lines
Signed-off-by Scott Murray <[email protected]>---
Hi Scott,
Thanks for your patch, and sorry for the delay.
I looks like this is breaking "no-x11" builds. I believe you should be able to reproduce this just with "DISTRO_FEATURES:remove = 'x11'":
ERROR: weston-15.0.0-r0
do_compile: Execution of '/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/temp/run.do_compile.2505757' failed with exit code 1
...| FAILED: [code=1] libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o | x86_64-poky-linux-gcc -m64 -march=x86-64-v3 -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot -Ilibweston/renderer-vulkan/vulkan-renderer.so.p -Ilibweston/renderer-vulkan -I../sources/weston-15.0.0/libweston/renderer-vulkan -I. -I../sources/weston-15.0.0 -Iinclude -I../sources/weston-15.0.0/include -Ilibweston -I../sources/weston-15.0.0/libweston -Iprotocol -I/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot/usr/include/libdrm -I/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot/usr/include/pixman-1 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu11 -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -Wmissing-prototypes -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -Wno-pedantic -Wundef -fvisibility=hidden -O2 -g -fcanon-prefix-map -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/sources/weston-15.0.0=/usr/src/debug/weston/15.0.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/build=/usr/src/debug/weston/15.0.0 -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot= -ffile-prefix-map=/srv/pokybuild/yocto-worker/no-x11/build/build/tmp/work/x86-64-v3-poky-linux/weston/15.0.0/recipe-sysroot-native= -pipe -fPIC -MD -MQ libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o -MF libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o.d -o libweston/renderer-vulkan/vulkan-renderer.so.p/vulkan-pipeline.c.o -c ../sources/weston-15.0.0/libweston/renderer-vulkan/vulkan-pipeline.c | In file included from ../sources/weston-15.0.0/libweston/renderer-vulkan/vulkan-pipeline.c:42: | ../sources/weston-15.0.0/libweston/renderer-vulkan/vulkan-renderer-internal.h:43:10: fatal error: xcb/xcb.h: No such file or directory | 43 | #include <xcb/xcb.h> | | ^~~~~~~~~~~ | compilation terminated. | ninja: build stopped: subcommand failed
Quoted 3 lines
https://autobuilder.yoctoproject.org/valkyrie/#/builders/25/builds/3404
Can you have a look at the error?
It seems upstream fixed this after 15.0.0, I have just sent a v2 with the fix backported as a patch after retesting with and without x11 in DISTRO_FEATURES.
Best regards,
Scott
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [kirkstone][PATCH] u-boot: move CVE patch out of u-boot-common.inc
Quoted 8 lines · Scott Murray via lists.openembedded.org
Commit
f5b980adadded CVE-2024-42040.patch to the base U-BootSRC_URIin u-boot-common.inc as opposed to adding it in the u-boot recipe where all the other patch additions are. This breaks at least one downstream BSP that reuses u-boot-common.inc (meta-sifive), so move that patch addition to the recipe file with all the others.Signed-off-by Scott Murray <[email protected]>
Please ignore, I accidentally resent this.
Scott
Quoted 33 lines
--- meta/recipes-bsp/u-boot/u-boot-common.inc | 4 +--- meta/recipes-bsp/u-boot/u-boot_2022.01.bb | 1 + 2 files changed, 2 insertions(+), 3 deletions(-)meta/recipes-bsp/u-boot/u-boot-common.inc +1
-3@@ -14,9 +14,7 @@ PE = "1" # repo during parse SRCREV = "d637294e264adfeb29f390dfc393106fd4d41b17" -SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master \ - file://CVE-2024-42040.patch \ -" +SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" S = "${WORKDIR}/git" B = "${WORKDIR}/build"meta/recipes-bsp/u-boot/u-boot_2022.01.bb +1
-0@@ -11,6 +11,7 @@ SRC_URI += " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \ file://CVE-2022-30790.patch \ file://CVE-2022-2347_1.patch \ file://CVE-2022-2347_2.patch \ + file://CVE-2024-42040.patch \ file://CVE-2024-57254.patch \ file://CVE-2024-57255.patch \ file://CVE-2024-57256.patch \
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCH 1/1] weston: update to 15.0.0
Quoted 21 lines · Scott Murray via lists.openembedded.org
Announcement:
https://lore.freedesktop.org/wayland-devel/aZbDU-xtVMLhB0wD@xpredator/Functional changes:
- New Vulkan renderer. A "vulkan" PACKAGECONFIG option has been added to enable building it, and it is enabled if "vulkan" is present inDISTRO_FEATURES, similar to how X11 and Wayland are handled.
- New Lua shell. A "lua-shell" PACkAGECONFIG option has been added to enable building it, but it has not been enabled by defsult to avoid affecting build times.
- Fullscreen shell and screen-share module marked as deprecated. Their PACKAGECONFIG options have been updated to still work, but have not been renamed to avoid breaking working configurations.
- Perfetto support. A "perfetto" PACKAGECONFIG option has been added to enable building it, but it is not on by default due to meta-oe being required to build.
- The "client-no-resize" option for the RDP backend has been replaced with "resizeable/no-resizeable" to match the VNC backend. The example in weston.ini has been updated.
Quoted 1 line
Signed-off-by Scott Murray <[email protected]>
I couldn't make the dev call this past week due to being at Embedded World, but I've seen no replies (perhaps a good thing wrt patchbot) and this does not seem to have made it to master-next. Is there something else required to get it considered for M3?
Thanks,
Scott
Quoted 125 lines
--- .../wayland/weston-init/weston.ini | 2 +- ...d-drm-meson.build-allow-libdisplay-i.patch | 28 ------------------- .../{weston_14.0.2.bb => weston_15.0.0.bb} | 17 +++++++---- 3 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch rename meta/recipes-graphics/wayland/{weston_14.0.2.bb => weston_15.0.0.bb} (88%)meta/recipes-graphics/wayland/weston-init/weston.ini +1
-1@@ -69,7 +69,7 @@ require-input=false #max_accel_factor = 1.0 [screen-share] -command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-resizeable #[xwayland] #path=/usr/bin/Xwaylandmeta/recipes-graphics/wayland/weston/0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch deleted +0
-28@@ -1,28 +0,0 @@ -From fe8166164170465458561581afd55c325d8e138b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 17 Dec 2025 12:54:20 +0100 -Subject: [PATCH] libweston/backend-drm/meson.build: allow libdisplay-info - 0.3.0 - -The patch in the main branch is against top level meson.build, -so I manually edited in the same tweak in the 14.x codebase. - -Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1815] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - libweston/backend-drm/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build -index 002669e..a8f2ea5 100644 ---- a/libweston/backend-drm/meson.build -+++ b/libweston/backend-drm/meson.build -@@ -4,7 +4,7 @@ endif - - dep_libdisplay_info = dependency( - 'libdisplay-info', -- version: ['>= 0.1.1', '< 0.3.0'], -+ version: ['>= 0.1.1', '< 0.4.0'], - fallback: ['display-info', 'di_dep'], - default_options: [ - 'werror=false',meta/recipes-graphics/wayland/weston_15.0.0.bb renamed from meta/recipes-graphics/wayland/weston_14.0.2.bb +11
-6@@ -11,10 +11,9 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo file://weston.desktop \ file://xwayland.weston-start \ file://systemd-notify.weston-start \ - file://0001-libweston-backend-drm-meson.build-allow-libdisplay-i.patch \ " -SRC_URI[sha256sum] = "b47216b3530da76d02a3a1acbf1846a9cd41d24caa86448f9c46f78f20b6e0ac" +SRC_URI[sha256sum] = "58c6186d29a5d2f0be0dec4882af71cc190a11da803f6ed1bf0b2c74120da973" UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"@@ -36,7 +35,7 @@ EXTRA_OEMESON += "-Dpipewire=false -Dtests=false" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd vulkan x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ image-jpeg \ screenshare \@@ -63,9 +62,11 @@ PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" # Weston on RDP PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp" # VA-API desktop recorder -PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" +PACKAGECONFIG[vaapi] = "-Ddeprecated-backend-drm-screencast-vaapi=true,-Ddeprecated-backend-drm-screencast-vaapi=false,libva" # Weston with EGL support PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" +# Weston with Vulkan support +PACKAGECONFIG[vulkan] = "-Drenderer-vulkan=true,-Drenderer-vulkan=false,glslang-native vulkan-loader vulkan-headers" # Weston with lcms support PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" # Weston with webp support@@ -79,21 +80,25 @@ PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true, # 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 -PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" +PACKAGECONFIG[screenshare] = "-Ddeprecated-screenshare=true,-Ddeprecated-screenshare=false" # Traditional desktop shell PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" # Fullscreen shell -PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" +PACKAGECONFIG[shell-fullscreen] = "-Ddeprecated-shell-fullscreen=true,-Ddeprecated-shell-fullscreen=false" # In-Vehicle Infotainment (IVI) shell PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" # Kiosk shell PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" +# Lua shell +PACKAGECONFIG[shell-lua] = "-Dshell-lua=true,-Dshell-lua=false,lua" # JPEG image loading support PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" # screencasting via PipeWire PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire,pipewire" # VNC remote screensharing PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc libpam" +# Perfetto performance analysis support +PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto" do_install:append() { # Weston doesn't need the .la files to load modules, so wipe them