From: Tom Hochstein Date: Sun, 22 Dec 2024 16:22:33 +0000 (-0600) Subject: weston: Disable unused tests build X-Git-Tag: yocto-5.2~933 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8996690a79ac42a1dee6d041eeb1c1fe29fdac84;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Tom Hochstein Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-graphics/wayland/weston_14.0.1.bb b/meta/recipes-graphics/wayland/weston_14.0.1.bb index 4cb0ca4d5fe..2a0a403d998 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', '', WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" -EXTRA_OEMESON += "-Dpipewire=false" +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)} \ @@ -72,7 +72,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd support PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland" # Clients support PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend