python3: move python link to its own python3-as-python package

the FILES is overriden in the python anonymous function for dynamic packages
(python3-core)

causing the following error:

```log
ERROR: python3-3.12.8-r0 do_package: QA Issue: python3: Files/directories were installed but not shipped in any package:
  /usr/bin/python
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
python3: 1 installed and not shipped files. [installed-vs-shipped]
ERROR: python3-3.12.8-r0 do_package: Fatal QA errors were found, failing task.
```

it is safer to make a new package split and add a RRECOMMENDS to python-core
on it

fixes:
https://codeberg.org/flk/meta-wayland/issues/14

Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>

README.md

@@ -5,7 +5,7 @@ Main layer maintainer: Markus Volk <f_l_k@t-online.de>
 Description
 
 This layer adds recipes to build wlroots based compositors under wayland.
-It contains wlroots, sway, wayfire, cage, nwg-shell and some additional recipes that might come useful.
+It contains wlroots, sway, wayfire, cage, phosh, nwg-shell and some additional recipes that might come useful.
 
 Dependencies
 

recipes-core/elogind/elogind_git.bb

@@ -7,15 +7,31 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/elogind/elogind.git;protocol=https;nobranch=1"
 
-DEPENDS += "gperf-native libcap eudev util-linux acl dbus python3-native polkit"
+DEPENDS += " \
+	acl dbus \
+	eudev \
+	gperf-native \
+	libcap \
+	libpam \
+	polkit \
+	python3-jinja2-native \
+	python3-native \
+	util-linux \
+"
+
 
 S = "${WORKDIR}/git"
-PV = "248-pre"
+PV = "249-pre"
-SRCREV = "eed62107e2165b6863ee95a730b8f93aa397b92d"
+SRCREV = "06e702c9dafa3ea1dd6df8ee8cb4dcf417a0d442"
 
 inherit meson pkgconfig
 
 EXTRA_OEMESON += "--buildtype release -Dtranslations=false"
 
+do_install:prepend() {
+	install -d ${D}${libdir}/elogind/system-shutdown
+	install -d ${D}${libdir}/elogind/system-sleep
+}
+
 FILES:${PN} += "/usr"
 

recipes-devtools/python/python3_%.bbappend

@@ -2,5 +2,7 @@ do_install:append:class-target() {
 	ln -sf ${bindir}/python3 ${D}${bindir}/python
 }
 
-FILES:${PN}:class-target += "${bindir}/python"
+PACKAGES:prepend:class-target = "${PN}-as-python "
+FILES:${PN}-as-python = "${bindir}/python"
+RRECOMMENDS:${PN}-core:append:class-target = " ${PN}-as-python"
 

recipes-extended/fcft/fcft/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch

@@ -0,0 +1,47 @@
+From c0c7a5df0b520960d7af662d112704901a235548 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 19 Apr 2022 13:50:54 +0200
+Subject: [PATCH] generate-version.sh: dont try to fetch version from git
+
+workaround for:
+
+| FAILED: version.h
+| /home/flk/build/poky/build-intel/tmp/hosttools/env LC_ALL=C ../git/generate-version.sh 3.0.1 ../git/ version.h
+| fatal: unsafe repository ('/home/flk/build/poky/build-intel/tmp/work/corei7-64-poky-linux/fcft/3.0.1-r0/git' is owned by someone else)
+---
+ generate-version.sh | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/generate-version.sh b/generate-version.sh
+index 3337d5c..76a6df9 100755
+--- a/generate-version.sh
++++ b/generate-version.sh
+@@ -10,24 +10,7 @@ out_file=${3}
+ # echo "source directory: ${src_dir}"
+ # echo "output file:      ${out_file}"
+ 
+-if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
+-    workdir=$(pwd)
+-    cd "${src_dir}"
+-
+-    if git describe --tags  > /dev/null 2>&1; then
+-        git_version=$(git describe --always --tags)
+-    else
+-        # No tags available, happens in e.g. CI builds
+-        git_version="${default_version}"
+-    fi
+-
+-    git_branch=$(git rev-parse --abbrev-ref HEAD)
+-    cd "${workdir}"
+-
+-    new_version="${git_version} ($(env LC_TIME=C date "+%b %d %Y"), branch '${git_branch}')"
+-else
+-    new_version="${default_version}"
+-fi
++new_version="${default_version}"
+ 
+ new_version="#define FCFT_VERSION \"${new_version}\""
+ 
+-- 
+2.25.1
+

recipes-extended/fcft/fcft_git.bb

@@ -15,7 +15,8 @@ DEPENDS = " \
 "
 
 SRC_URI = " \
-	git://codeberg.org/dnkl/fcft.git;protocol=https;branch=master \
+	git://codeberg.org/dnkl/fcft.git;protocol=https;branch=releases/3.0 \
+	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
 "
 
 S = "${WORKDIR}/git"

recipes-extended/font-awesome/font-awesome-otf_git.bb

@@ -3,16 +3,16 @@ SUMMARY = "Font Awesome"
 HOMEPAGE = "https://fontawesome.com/"
 SECTION = "base/fonts"
 
-LICENSE = "OFL-1.1"
+LICENSE = "CC-BY-4.0 & OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e3494502db283e8891d4886fe445912"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57f9201afe70f877988912a7b233de47"
 
 SRC_URI = " \
 	git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \
 "
 
 S = "${WORKDIR}/git"
-PV = "6.0.0"
+PV = "6.1.1"
-SRCREV = "65f4bdb5025759ba25cd3432568de288b6a67527"
+SRCREV = "28e297f07af26f148c15e6cbbd12cea3027371d3"
 
 
 do_install () {

recipes-extended/xcur2png/xcur2png_git.bb

@@ -0,0 +1,15 @@
+DESCRIPTION = "xcur2png is a program which let you take PNG image from X cursor, and generate config-file which is reusable by xcursorgen."
+HOMEPAGE = "https://github.com/eworm-de/xcur2png"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "libxcursor libpng"
+
+S = "${WORKDIR}/git"
+SRCREV = "f582d648f37a9ed2de0c8650947487af8a54d3ad"
+PV = "0.7.1"
+
+SRC_URI = "git://github.com/eworm-de/xcur2png.git;protocol=https;branch=master"
+
+inherit autotools pkgconfig
+

recipes-graphics/wayland/waylandpp_git.bb

@@ -8,8 +8,8 @@ DEPENDS = "pugixml"
 DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
 
 S = "${WORKDIR}/git"
-SRCREV = "e5bc48c12651872711ce08ec8da4871e7c522571"
+SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3"
-PV = "0.2.9"
+PV = "1.0.0"
 
 inherit cmake pkgconfig
 

recipes-gtk/nwg-shell/nwg-bar_git.bb

@@ -12,17 +12,12 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-bar.git"
 
 SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
 
-PV = "0.0.1"
+PV = "0.1.0"
-SRCREV = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"
+SRCREV = "eee48b9575936495b5b7d6bc88e14d736245259a"
 
 inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
 
-do_install:append() {
-	# remove precompiled x86 binary
-	rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin
-}
-
 do_compile[network] = "1"
 

recipes-gtk/nwg-shell/nwg-look_git.bb

@@ -0,0 +1,28 @@
+SUMMARY = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment."
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=2e53cad864b84be468b2fc0b511942ce"
+
+DEPENDS = "xcur2png gtk+3"
+RDEPENDS:${PN} = "xcur2png"
+
+GO_IMPORT = "github.com/nwg-piotr/nwg-look.git"
+
+SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+SRCREV = "36b6d80f20244d6886efd6e1f1fcff75bc3281c2"
+PV = "0.1.2"
+
+inherit go go-mod pkgconfig gtk-icon-cache
+
+GO_INSTALL = "${GO_IMPORT}"
+
+do_install:append() {
+	install -d ${D}${datadir}/nwg-look ${D}${datadir}/applications ${D}${datadir}/icons/hicolor/scalable/apps
+	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/main.glade ${D}${datadir}/nwg-look
+	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/nwg-look.desktop ${D}${datadir}/applications
+	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/nwg-look.svg ${D}${datadir}/icons/hicolor/scalable/apps
+}
+
+FILES:${PN} += "${datadir}"
+
+do_compile[network] = "1"
+

recipes-gtk/nwg-shell/nwg-panel_git.bb

@@ -19,6 +19,6 @@ RDEPENDS:${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.6.2"
+PV = "0.6.3"
-SRCREV = "f5622e1a35e63840fb1826a2ef35a8edb9dfcbc2"
+SRCREV = "11336063c318e4015bce9144493a97a6afa6d372"
 

recipes-gtk/swaync/swaync_git.bb

@@ -17,13 +17,15 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.3"
+PV = "0.5"
-SRCREV = "6f850ebadb31a3fac42a664bbc1094823d4cdf32"
+SRCREV = "77b8a85ce1a230ea9b5433062f46f15a2e5a7235"
 
 PACKAGECONFIG[bash] = "-Dbash-completions=true,-Dbash-completions=false"
 PACKAGECONFIG[fish] = "-Dfish-completions=true,-Dfish-completions=false"
-PACKAGECONFIG[zsh] = "-Dzsh-completions=true,-Dzsh-completions=false"
+PACKAGECONFIG[man-pages] = "-Dman-pages=true,-Dman-pages=false,scdoc-native"
+PACKAGECONFIG[scripting] = "-Dscripting=true,-Dscripting=false"
 PACKAGECONFIG[systemd] = "-Dsystemd-service=true,-Dsystemd-service=false"
+PACKAGECONFIG[zsh] = "-Dzsh-completions=true,-Dzsh-completions=false"
 
 PACKAGECONFIG ?= " \
 	bash \

recipes-support/foot/foot/0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch

@@ -0,0 +1,44 @@
+From bd6828df037d588c60a30f21fdb83780e8ad0966 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 19 Apr 2022 13:41:21 +0200
+Subject: [PATCH] generate-version.sh: dont try to fetch version from git
+
+---
+ generate-version.sh | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/generate-version.sh b/generate-version.sh
+index a030d512..5114abe0 100755
+--- a/generate-version.sh
++++ b/generate-version.sh
+@@ -15,25 +15,8 @@ out_file=${3}
+ # echo "source directory: ${src_dir}"
+ # echo "output file:      ${out_file}"
+ 
+-if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
+-    workdir=$(pwd)
+-    cd "${src_dir}"
+-
+-    if git describe --tags  > /dev/null 2>&1; then
+-        git_version=$(git describe --always --tags)
+-    else
+-        # No tags available, happens in e.g. CI builds
+-        git_version="${default_version}"
+-    fi
+-
+-    git_branch=$(git rev-parse --abbrev-ref HEAD)
+-    cd "${workdir}"
+-
+-    new_version="${git_version} ($(date "+%b %d %Y"), branch '${git_branch}')"
+-else
+-    new_version="${default_version}"
+-    extra=""
+-fi
++new_version="${default_version}"
++extra=""
+ 
+ major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/')
+ minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/')
+-- 
+2.25.1
+

recipes-support/foot/foot/0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch

@@ -0,0 +1,70 @@
+From 72bc0acfbd4b002ebf26d65368bb65601452353e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
+Date: Mon, 3 Jul 2023 14:36:03 +0200
+Subject: [PATCH 001/117] wayland: handle enum value
+ XDG_TOPLEVEL_STATE_SUSPENDED
+
+Added in wayland-protocols-1.32
+---
+ wayland.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/wayland.c b/wayland.c
+index 406aba6d..5160240b 100644
+--- a/wayland.c
++++ b/wayland.c
+@@ -651,6 +651,7 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
+     bool is_tiled_bottom = false;
+     bool is_tiled_left = false;
+     bool is_tiled_right = false;
++    bool is_suspended UNUSED = false;
+ 
+ #if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
+     char state_str[2048];
+@@ -665,29 +666,35 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
+         [XDG_TOPLEVEL_STATE_TILED_RIGHT] = "tiled:right",
+         [XDG_TOPLEVEL_STATE_TILED_TOP] = "tiled:top",
+         [XDG_TOPLEVEL_STATE_TILED_BOTTOM] = "tiled:bottom",
++#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION)  /* wayland-protocols >= 1.32 */
++        [XDG_TOPLEVEL_STATE_SUSPENDED] = "suspended",
++#endif
+     };
+ #endif
+ 
+     enum xdg_toplevel_state *state;
+     wl_array_for_each(state, states) {
+         switch (*state) {
+-        case XDG_TOPLEVEL_STATE_ACTIVATED:    is_activated = true; break;
+-        case XDG_TOPLEVEL_STATE_FULLSCREEN:   is_fullscreen = true; break;
+         case XDG_TOPLEVEL_STATE_MAXIMIZED:    is_maximized = true; break;
++        case XDG_TOPLEVEL_STATE_FULLSCREEN:   is_fullscreen = true; break;
++        case XDG_TOPLEVEL_STATE_RESIZING:     is_resizing = true; break;
++        case XDG_TOPLEVEL_STATE_ACTIVATED:    is_activated = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_LEFT:   is_tiled_left = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_RIGHT:  is_tiled_right = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_TOP:    is_tiled_top = true; break;
+         case XDG_TOPLEVEL_STATE_TILED_BOTTOM: is_tiled_bottom = true; break;
+-        case XDG_TOPLEVEL_STATE_RESIZING:     is_resizing = true; break;
+-        }
++
++#if defined(XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION)
++        case XDG_TOPLEVEL_STATE_SUSPENDED:    is_suspended = true; break;
++#endif
++    }
+ 
+ #if defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
+-        if (*state >= XDG_TOPLEVEL_STATE_MAXIMIZED &&
+-            *state <= XDG_TOPLEVEL_STATE_TILED_BOTTOM)
+-        {
++        if (*state >= 0 && *state < ALEN(strings)) {
+             state_chars += snprintf(
+                 &state_str[state_chars], sizeof(state_str) - state_chars,
+-                "%s, ", strings[*state]);
++                "%s, ",
++                strings[*state] != NULL ? strings[*state] : "<unknown>");
+         }
+ #endif
+     }
+-- 
+2.41.0
+

recipes-support/foot/foot_git.bb

@@ -16,15 +16,17 @@ DEPENDS = " \
 	wayland-native \
 "
 
-RRECOMMENDS:${PN} = "ncurses-terminfo xdg-utils"
+RRECOMMENDS:${PN} = "ncurses-terminfo"
 
 SRC_URI = " \
-	git://codeberg.org/dnkl/foot.git;protocol=https;branch=master \
+	git://codeberg.org/dnkl/foot.git;protocol=https;branch=releases/1.12 \
+	file://0001-generate-version.sh-dont-try-to-fetch-version-from-g.patch \
+	file://0001-wayland-handle-enum-value-XDG_TOPLEVEL_STATE_SUSPEND.patch \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.11.0"
+PV = "1.12.1"
-SRCREV = "8c66dbbd788972db8b7338ca6b7aea8991fce963"
+SRCREV = "e95269447f1b62384dc64707bb19ebe1006386ac"
 
 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
 PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"
@@ -42,6 +44,8 @@ inherit meson pkgconfig
 FILES:${PN} = " \
 	${bindir} \
 	${datadir} \
+	${libdir} \
+	${sysconfdir} \
 "
 
 BBCLASSEXTEND = ""

recipes-support/mako/mako/0001-meson.build-make-epoll-shim-dependency-optional.patch

@@ -0,0 +1,28 @@
+From e7973e352b8649b10053f3feb82134d9cefb851e Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 17 May 2022 19:00:02 +0200
+Subject: [PATCH] meson.build: make epoll-shim dependency optional
+
+After updating my host system, meson.build tries to depend on the epoll-shim.
+Since we are not on BSD, we dont have it and it is not needed. Make the
+dependency on it optional.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 84abdcb..9687b23 100644
+--- a/meson.build
++++ b/meson.build
+@@ -35,7 +35,7 @@ wayland_cursor = dependency('wayland-cursor')
+ epoll = dependency('', required: false)
+ if (not cc.has_function('timerfd_create', prefix: '#include <sys/timerfd.h>') or
+     not cc.has_function('signalfd', prefix: '#include <sys/signalfd.h>'))
+-	epoll = dependency('epoll-shim')
++	epoll = dependency('epoll-shim', required: false)
+ endif
+ 
+ if get_option('sd-bus-provider') == 'auto'
+-- 
+2.25.1
+

recipes-support/mako/mako_git.bb

@@ -9,6 +9,7 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = " \
 	git://github.com/emersion/mako.git;protocol=https;branch=master \
+	file://0001-meson.build-make-epoll-shim-dependency-optional.patch \
 "
 
 DEPENDS = " \

recipes-support/squeekboard/squeekboard_git.bb

@@ -74,9 +74,9 @@ SRC_URI = "\
     "
 
 # Modify these as desired
-PV = "1.17.0"
+PV = "1.17.1"
-SRCREV = "c912b73c4b229b61ce30d2923988e3277f3fe5a8"
+SRCREV = "2faa98d85f1142383ec8ad1487616c1a7ad1882f"
-BRANCH = "master"
+BRANCH = "1.17"
 
 S = "${WORKDIR}/git"
 
@@ -86,7 +86,8 @@ EXTRA_OEMESON = "\
     -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
     -Dtests=false \
     -Ddepdatadir=${datadir} \
-    "
+    -Donline=false \
+"
 
 export CARGO_FEATURE_STD = "1"
 

recipes-wlroots/wlroots/wlroots-tinywl/Makefile

@@ -0,0 +1,27 @@
+WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols)
+WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner)
+LIBS=\
+	 $(shell pkg-config --cflags --libs wlroots) \
+	 $(shell pkg-config --cflags --libs wayland-server) \
+	 $(shell pkg-config --cflags --libs xkbcommon)
+
+# wayland-scanner is a tool which generates C headers and rigging for Wayland
+# protocols, which are specified in XML. wlroots requires you to rig these up
+# to your build system yourself and provide them in the include path.
+xdg-shell-protocol.h:
+	$(WAYLAND_SCANNER) server-header \
+		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
+
+tinywl: tinywl.c xdg-shell-protocol.h
+	$(CC) $(CFLAGS) \
+		-g -Werror -I. \
+		-DWLR_USE_UNSTABLE \
+		${LDFLAGS} \
+		-o $@ $< \
+		$(LIBS)
+
+clean:
+	rm -f tinywl xdg-shell-protocol.h xdg-shell-protocol.c
+
+.DEFAULT_GOAL=tinywl
+.PHONY: clean

recipes-wlroots/wlroots/wlroots-tinywl_0.15.1.bb

@@ -0,0 +1,36 @@
+LICENSE = "CCO-1.0"
+LIC_FILES_CHKSUM = "file://tinywl/LICENSE;md5=d957da0415f5b0b974bfc6063afab2b5"
+
+SRC_URI = "\
+    https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PV}/wlroots-${PV}.tar.gz \
+    file://Makefile \
+"
+SRC_URI[md5sum] = "d847f52dd4be602918fdfa25e00aef27"
+
+DEPENDS += "\
+    libxkbcommon \
+    wayland \
+    wayland-native \
+    wlroots \
+"
+
+S = "${WORKDIR}/wlroots-${PV}"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE = "\
+    'CC=${CC}' \
+    'CFLAGS=${CFLAGS}' \
+    'LDFLAGS=${LDFLAGS}' \
+"
+
+do_compile() {
+    cp ${WORKDIR}/Makefile ${S}/tinywl/
+
+    cd ${S}/tinywl
+    oe_runmake ${EXTRA_OEMAKE} tinywl VERBOSE=1
+}
+
+do_install() {
+    install -Dm0755 ${S}/tinywl/tinywl ${D}${bindir}/tinywl
+}

recipes-wlroots/wlroots/wlroots_git.bb

@@ -29,7 +29,7 @@ PACKAGECONFIG[systemd] = ",,systemd"
 PACKAGECONFIG[sysvinit] = ",,eudev elogind"
 PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang glslang-native"
 PACKAGECONFIG[x11] = ",,xcb-util-renderutil"
-PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xserver-xorg xcb-util-wm"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-wm"
 
 PACKAGECONFIG ?= " \
 	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \