diff mbox series

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

Message ID acca25d2cbd58d50cbaa3962f922990fee700403.1687444823.git.pidge@baylibre.com
State New
Headers show
Series wayland/weston upgrades | expand

Commit Message

Eilís 'pidge' Ní Fhlannagáin June 22, 2023, 2:42 p.m. UTC 
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 <pidge@baylibre.com>
---
 .../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.bb

Comments

Luca Ceresoli June 23, 2023, 10:16 a.m. UTC | #1 
Hello Eilís,

On Thu, 22 Jun 2023 15:42:16 +0100
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.
> 
> 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 <pidge@baylibre.com>
> ---
>  .../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/20230622203913.183451-1-tom.hochstein@nxp.com/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
Eilís 'pidge' Ní Fhlannagáin June 23, 2023, 11:15 a.m. UTC | #2 
On 23/06/2023 11:16, Luca Ceresoli wrote:
> Hello Eilís,
> 
> On Thu, 22 Jun 2023 15:42:16 +0100
> 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.
>>
>> 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 <pidge@baylibre.com>
>> ---
>>   .../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/20230622203913.183451-1-tom.hochstein@nxp.com/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.

> 
> 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]
> 

I'll add that in v3 and take maintainership.

> Full log:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5511/steps/13/logs/stdio
> 
> Luca
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/wayland/weston_11.0.1.bb b/meta/recipes-graphics/wayland/weston_12.0.1.bb
similarity index 90%
rename from meta/recipes-graphics/wayland/weston_11.0.1.bb
rename to meta/recipes-graphics/wayland/weston_12.0.1.bb
index 4f6ce19915..c15d55d86a 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+)"
@@ -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
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb b/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb
new file mode 100644
index 0000000000..047697845c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb
@@ -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"