From 3588af3c36f94be262a3843877b9f0602b5efe2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 9 Apr 2022 17:43:53 +0200 Subject: [PATCH] xserver-xorg: Adjust to changes happened since MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * do not build xwayland * remove cvt it is supplied by libxcvt Signed-off-by: Andreas Müller --- recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/xorg-xserver/xserver-xorg.inc b/recipes-graphics/xorg-xserver/xserver-xorg.inc index c5cd627..aef2741 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -131,7 +131,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)} \ " @@ -161,6 +160,7 @@ do_install:append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 + rm -f ${D}${bindir}/cvt } # Add runtime provides for the ABI versions of the video and input subsystems,