summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@oss.nxp.com>2024-12-22 10:22:33 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-23 11:32:26 +0000
commit44dc34bb2221b3e2b9de08fad94158a2b92982f3 (patch)
tree42ee6624f3d5158fd83c50aa2161739ad4a880d2
parentcfc82539996e226bade22aed66b1276028db005d (diff)
downloadpoky-44dc34bb2221b3e2b9de08fad94158a2b92982f3.tar.gz
weston: Disable unused tests build
Building weston with core-image-weston SDK fails for xwayland tests: ``` Run-time dependency xcb-cursor found: NO (tried pkgconfig and cmake) tests/meson.build:357:2: ERROR: Problem encountered: xcb and xcb-cursor required for running xwayland tests ``` The problem is the tests folder is built but not installed. This behavior seems to have been introduced with the 12.0.1 upgrade. https://github.com/openembedded/openembedded-core/commit/be7da75827b4ffee3a243f977faad429dd9fa21c Disable the build of the unused tests. Also drop the xwayland dependency on xcb-util-cursor since it is a specific requirement for the xwayland test build. (From OE-Core rev: 8996690a79ac42a1dee6d041eeb1c1fe29fdac84) Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston_14.0.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston_14.0.1.bb b/meta/recipes-graphics/wayland/weston_14.0.1.bb
index 4cb0ca4d5f..2a0a403d99 100644
--- a/meta/recipes-graphics/wayland/weston_14.0.1.bb
+++ b/meta/recipes-graphics/wayland/weston_14.0.1.bb
@@ -31,7 +31,7 @@ LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '',
31 31
32WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" 32WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
33 33
34EXTRA_OEMESON += "-Dpipewire=false" 34EXTRA_OEMESON += "-Dpipewire=false -Dtests=false"
35 35
36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ 36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \
37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
@@ -72,7 +72,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
72# Weston with systemd support 72# Weston with systemd support
73PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" 73PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus"
74# Weston with Xwayland support (requires X11 and Wayland) 74# Weston with Xwayland support (requires X11 and Wayland)
75PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" 75PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland"
76# Clients support 76# Clients support
77PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" 77PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
78# Virtual remote output with GStreamer on DRM backend 78# Virtual remote output with GStreamer on DRM backend