summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2023-06-22 15:39:13 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-24 12:21:48 +0100
commitbd8d5e20f4831e9e0ec6150ef57affd6acba3c48 (patch)
tree88f1bdb832aeac7186f0b59d863cc1f3c28e5183 /meta
parent0baac70b8ba5e95075f56be986ea2ca3e6590632 (diff)
downloadpoky-bd8d5e20f4831e9e0ec6150ef57affd6acba3c48.tar.gz
weston: Cleanup and fix x11 and xwayland dependencies
For the x11 backend package config, drop the redundant dependencies libxcb and cairo. The former is listed twice in the package config, while the latter is also listed globally. For the xwayland package config, add the missing dependencies libxcb and libxcursor. These dependencies are hidden when the x11 backend is enabled by default. When the default setting is overridden to disable the x11 backend, the following error occurs: ``` | Run-time dependency xcursor found: NO (tried pkgconfig and cmake) | | ../git/xwayland/meson.build:34:2: ERROR: Problem encountered: xwayland requires xcursor which was not found. Or, you can use '-Dxwayland=false'. ``` (From OE-Core rev: 49f4dd391b408a850d13010c90492c621b7912c3) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston_11.0.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston_11.0.1.bb b/meta/recipes-graphics/wayland/weston_11.0.1.bb
index 4f6ce19915..0838791a6b 100644
--- a/meta/recipes-graphics/wayland/weston_11.0.1.bb
+++ b/meta/recipes-graphics/wayland/weston_11.0.1.bb
@@ -57,7 +57,7 @@ PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/eg
57# Weston on Wayland (nested Weston) 57# Weston on Wayland (nested Weston)
58PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" 58PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2"
59# Weston on X11 59# Weston on X11
60PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" 60PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor"
61# Headless Weston 61# Headless Weston
62PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" 62PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
63# Weston on RDP 63# Weston on RDP
@@ -73,7 +73,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
73# Weston with systemd-login support 73# Weston with systemd-login support
74PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" 74PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus"
75# Weston with Xwayland support (requires X11 and Wayland) 75# Weston with Xwayland support (requires X11 and Wayland)
76PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" 76PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xwayland"
77# colord CMS support 77# colord CMS support
78PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" 78PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
79# Clients support 79# Clients support