From 17ea76c3146edd0af374a959c0913db941c5c077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 2 May 2021 17:42:05 +0200 Subject: [PATCH] recipes-wayland: replace xserver-xorg-xwayland by standalone xwayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-wayland/cage/cage.bb | 2 +- recipes-wayland/sway/wlroots.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-wayland/cage/cage.bb b/recipes-wayland/cage/cage.bb index 67b700f..c7a8bda 100644 --- a/recipes-wayland/cage/cage.bb +++ b/recipes-wayland/cage/cage.bb @@ -22,5 +22,5 @@ PV = "0.1.2.1" S = "${WORKDIR}/git" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland','',d)}" -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xserver-xorg-xwayland" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xserver-xorg,xwayland" diff --git a/recipes-wayland/sway/wlroots.bb b/recipes-wayland/sway/wlroots.bb index d24bca7..6d0f633 100644 --- a/recipes-wayland/sway/wlroots.bb +++ b/recipes-wayland/sway/wlroots.bb @@ -22,7 +22,7 @@ inherit meson features_check REQUIRED_DISTRO_FEATURES = "wayland opengl" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','x11','xwayland x11-backend','',d)}" -PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xserver-xorg-xwayland" +PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg,xwayland" PACKAGECONFIG[x11-backend] = "-Dx11-backend=enabled,-Dx11-backend=disabled,xserver-xorg" SRC_URI = " \