]> code.ossystems Code Review - meta-freescale.git/commitdiff
weston: add libxcursor to depends for xwayland
authorMax Krummenacher <max.krummenacher@toradex.com>
Wed, 30 Sep 2020 17:38:09 +0000 (19:38 +0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Fri, 2 Oct 2020 12:37:37 +0000 (09:37 -0300)
Otherwise configure will fail.

| ../git/xwayland/meson.build:27:2: ERROR: Problem encountered: xwayland requires xcursor which was not found. Or, you can use '-Dxwayland=false'.

This reverts additionally commit 86cde62d1 which addressed the same issue.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit d49ab0d5bbd01d8cca8103668da72962124e14d3)

recipes-graphics/wayland/weston_8.0.0.imx.bb

index a2ce2a6962589873a99aa513b2cdfaf4fdc96bfb..24a21db5d10b09e69985094edface6bc1e46dc5c 100644 (file)
@@ -65,7 +65,7 @@ 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"
 # Weston with Xwayland support (requires X11 and Wayland)
-PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false"
+PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor"
 # colord CMS support
 PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord"
 # Clients support
@@ -144,7 +144,7 @@ PACKAGECONFIG_OPENGL              = "opengl"
 PACKAGECONFIG_OPENGL_imxgpu2d     = ""
 PACKAGECONFIG_OPENGL_imxgpu3d     = "opengl"
 
-PACKAGECONFIG_remove = "wayland x11 xwayland"
+PACKAGECONFIG_remove = "wayland x11"
 PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}"
 
 PACKAGECONFIG_remove_imxfbdev = "kms"