From: Kai Kang <kai.kang@windriver.com>
Date: Wed, 9 Apr 2025 01:55:23 +0000 (+0800)
Subject: xserver-xorg: remove sub-package ${PN}-xwayland
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59e759207e349bece9da8bbcb5216df5923d243b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

xserver-xorg: remove sub-package ${PN}-xwayland

xwayland has been split to a standalone package via commit

* 4ee66f574 Drop XWayland DDX

https://gitlab.freedesktop.org/xorg/xserver/-/commit/4ee66f574

and there is a recipe for xwayland in oe-core too. So remove sub-package
${PN}-xwayland from xserver-xorg accordingly.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 94d55072fed..fbe860c6ea2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -59,7 +59,6 @@ PACKAGES =+ "${PN}-sdl \
              ${PN}-xvfb \
              ${PN}-utils \
              ${PN}-xephyr \
-             ${PN}-xwayland \
              ${PN}-multimedia-modules \
              ${PN}-extension-dri \
              ${PN}-extension-dri2 \
@@ -82,7 +81,6 @@ SUMMARY:xf86-video-modesetting = "X.Org X server -- modesetting display driver"
 
 XSERVER_RDEPENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp xf86-input-libinput"
 RDEPENDS:${PN} += "${XSERVER_RDEPENDS}"
-RDEPENDS:${PN}-xwayland += "${XSERVER_RDEPENDS}"
 RDEPENDS:${PN}-xvfb += "xkeyboard-config"
 RDEPENDS:${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
 
@@ -94,7 +92,6 @@ FILES:${PN}-fbdev = "${bindir}/Xfbdev"
 FILES:${PN}-xvfb = "${bindir}/Xvfb"
 FILES:${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
 FILES:${PN}-xephyr = "${bindir}/Xephyr"
-FILES:${PN}-xwayland = "${bindir}/Xwayland"
 FILES:${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
 FILES:${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
 FILES:${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"