From e933962061ac3fa1c0c1069b8075a5f7645001c4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Apr 2021 11:02:24 +0200 Subject: [PATCH] weston: use standalone xwayland instead of outdated xserver-xorg version Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston_9.0.0.bb | 2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_9.0.0.bb b/meta/recipes-graphics/wayland/weston_9.0.0.bb index 50fbfa613b..34ac66d4e9 100644 --- a/meta/recipes-graphics/wayland/weston_9.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_9.0.0.bb @@ -124,7 +124,7 @@ SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wa FILES_${PN}-examples = "${bindir}/*" FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" +RDEPENDS_${PN}-xwayland += "xwayland" RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "weston-init liberation-fonts" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index b3e03744c0..da025171db 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -122,7 +122,6 @@ EXTRA_OECONF += "--with-fop=no \ OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ " -- 2.40.1