summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-04-08 13:11:58 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-04-08 13:11:58 +0200
commit6624db6111bd5df4c12239e6e5f54f299737c46e (patch)
tree30c859c70a82f7e7b622483e9b913ee34bc70635
parentd89aa2d577129ec3d8ffddccb71c7a54c91760ad (diff)
Fix dependency issue around mesa and egl in weston_6.0.0
Fix issues like: ERROR: weston-6.0.0-r0.agl_arago_23 do_prepare_recipe_sysroot: The file /usr/lib/libglapi.so.0 is installed by both mesa-gl and ti-sgx-ddk-um, aborting ERROR: weston-6.0.0-r0.agl_arago_23 do_prepare_recipe_sysroot: Function failed: extend_recipe_sysro by applying the solution from recent upstream versions. Bug-AGL: SPEC-3320 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I4b56f13ead056b7a63be70b9116d744916719e82
-rw-r--r--meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb b/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb
index f1e67e3..ca55438 100644
--- a/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb
+++ b/meta-agl-bsp/recipes-graphics/wayland/weston_6.0.0.bb
@@ -40,9 +40,9 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev
# Compositor choices
#
# Weston on KMS
-PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa virtual/libgbm mtdev"
+PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev"
# Weston on Wayland (nested Weston)
-PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa"
+PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/egl virtual/libgles2"
# Weston on X11
PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo"
# Headless Weston