Merge pull request #2481 from fewtarius/feat-xwayland

Switch the xorg-server package to xwayland. (Please test)
2023-12-02 06:55:14 -05:00 · 2023-12-02 06:55:14 -05:00 · ff8016d0c4
commit ff8016d0c4
parent f9750267ee 704b219c8b
38 changed files with 37 additions and 180 deletions
--- a/packages/emulators/libretro/dolphin-lr/package.mk
+++ b/packages/emulators/libretro/dolphin-lr/package.mk
@ -26,7 +26,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
  PKG_CONFIGURE_OPTS_TARGET+=" -DENABLE_X11=ON \
                               -DENABLE_EGL=ON"
 fi
--- a/packages/emulators/standalone/cemu-sa/package.mk
+++ b/packages/emulators/standalone/cemu-sa/package.mk
@ -18,7 +18,7 @@ PKG_BUILD_FLAGS="+lto"
 configure_package() {
  # Displayserver Support
  if [ "${DISPLAYSERVER}" = "x11" ]; then
-    PKG_DEPENDS_TARGET+=" xorg-server"
+    PKG_DEPENDS_TARGET+=" xwayland"
  elif [ "${DISPLAYSERVER}" = "wl" ]; then
    PKG_DEPENDS_TARGET+=" wayland"
  fi
--- a/packages/emulators/standalone/dolphin-sa/package.mk
+++ b/packages/emulators/standalone/dolphin-sa/package.mk
@ -34,7 +34,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
  PKG_CMAKE_OPTS_TARGET+="     -DENABLE_WAYLAND=ON \
                               -DENABLE_X11=ON"
 else
--- a/packages/emulators/standalone/duckstation-sa/package.mk
+++ b/packages/emulators/standalone/duckstation-sa/package.mk
@ -38,7 +38,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
  PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND=ON"
 fi

--- a/packages/emulators/standalone/melonds-sa/package.mk
+++ b/packages/emulators/standalone/melonds-sa/package.mk
@ -29,7 +29,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
 fi

 if [ "${VULKAN_SUPPORT}" = "yes" ]
--- a/packages/emulators/standalone/primehack/package.mk
+++ b/packages/emulators/standalone/primehack/package.mk
@ -24,7 +24,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
  PKG_CMAKE_OPTS_TARGET+="     -DENABLE_WAYLAND=ON \
                               -DENABLE_X11=OFF"
 fi
--- a/packages/emulators/standalone/rpcs3-sa/package.mk
+++ b/packages/emulators/standalone/rpcs3-sa/package.mk
@ -9,7 +9,7 @@ PKG_LICENSE="GPL-2.0-or-later"
 PKG_SITE="https://rpcs3.net"
 PKG_URL="https://github.com/RPCS3/rpcs3.git"
 PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain linux glibc systemd pulseaudio mesa xorg-server libevdev curl ffmpeg libpng zlib glew-cmake libSM SDL2 enet qt5 rpcs3-sa:host vulkan-headers vulkan-loader vulkan-tools libp11-kit yamlcpp openal-soft soundtouch"
+PKG_DEPENDS_TARGET="toolchain linux glibc systemd pulseaudio mesa xwayland libevdev curl ffmpeg libpng zlib glew-cmake libSM SDL2 enet qt5 rpcs3-sa:host vulkan-headers vulkan-loader vulkan-tools libp11-kit yamlcpp openal-soft soundtouch"
 PKG_LONGDESC="RPCS3 is an experimental open-source Sony PlayStation 3 emulator and debugger."
 GET_HANDLER_SUPPORT="git"
 PKG_GIT_CLONE_BRANCH="master"
--- a/packages/emulators/standalone/yuzu-sa/package.mk
+++ b/packages/emulators/standalone/yuzu-sa/package.mk
@ -22,7 +22,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then
 fi

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi"
 fi

 if [ "${VULKAN_SUPPORT}" = "yes" ]
--- a/packages/graphics/glew/package.mk
+++ b/packages/graphics/glew/package.mk
@ -11,7 +11,7 @@ PKG_SHORTDESC="GLEW - The OpenGL Extension Wrangler Library"
 PKG_TOOLCHAIN="cmake"

 if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xorg-server xrandr libXi libX11"
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER} xwayland xrandr libXi libX11"
  PKG_CMAKE_OPTS_TARGET+=" -DGLEW_X11=ON"
 fi

--- a/packages/kernel/linux/package.mk
+++ b/packages/kernel/linux/package.mk
@ -7,7 +7,7 @@ PKG_LICENSE="GPL"
 PKG_VERSION="6.6.3"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_SITE="http://www.kernel.org"
-PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
+PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host rdfind:host"
 PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"
 PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
--- a/packages/virtual/x11/package.mk
+++ b/packages/virtual/x11/package.mk
@ -6,11 +6,11 @@ PKG_VERSION=""
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain xorg-server"
+PKG_DEPENDS_TARGET="toolchain xwayland"
 PKG_SECTION="virtual"
 PKG_LONGDESC="X11 is the Windowing system"

-# Additional packages we need for using xorg-server:
+# Additional packages we need for using xwayland:
 # Fonts
  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"

--- a/packages/wayland/lib/wlroots/package.mk
+++ b/packages/wayland/lib/wlroots/package.mk
@ -6,7 +6,7 @@ PKG_VERSION="0.16.2"
 PKG_LICENSE="MIT"
 PKG_SITE="https://gitlab.freedesktop.org/wlroots/wlroots/"
 PKG_URL="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd xorg-server"
+PKG_DEPENDS_TARGET="toolchain libinput libxkbcommon pixman libdrm wayland wayland-protocols seatd xwayland"
 PKG_LONGDESC="A modular Wayland compositor library"

 configure_package() {
--- a/packages/wayland/libinput/package.mk
+++ b/packages/wayland/libinput/package.mk
@ -3,8 +3,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libinput"
-PKG_VERSION="1.23.0"
-PKG_SHA256="fad7011705a21f500229199f789f3e3e794b4c9826b70073745cdaec23bc1d0b"
+PKG_VERSION="1.24.0"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.freedesktop.org/wiki/Software/libinput/"
 PKG_URL="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
--- a/packages/wayland/libxkbcommon/package.mk
+++ b/packages/wayland/libxkbcommon/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libxkbcommon"
-PKG_VERSION="1.5.0"
+PKG_VERSION="1.6.0"
 PKG_LICENSE="MIT"
 PKG_SITE="https://xkbcommon.org"
 PKG_URL="https://xkbcommon.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/wayland/weston/package.mk
+++ b/packages/wayland/weston/package.mk
@ -2,13 +2,13 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="weston"
-PKG_VERSION="68e2a606c056c8453c770263f41f34cd68bdc9d0" # 12.0.2 +
+PKG_VERSION="12.0.3"

 PKG_LICENSE="MIT"
 PKG_SITE="https://wayland.freedesktop.org/"
-#PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_URL="https://gitlab.freedesktop.org/wayland/weston.git"
-PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libxcb-cursor libinput cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xorg-server libXcursor xkbcomp setxkbmap cairo xterm"
+PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+#PKG_URL="https://gitlab.freedesktop.org/wayland/weston.git"
+PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libxcb-cursor libinput cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xwayland libXcursor xkbcomp setxkbmap cairo xterm"
 PKG_LONGDESC="Reference implementation of a Wayland compositor"
 PKG_PATCH_DIRS+="${DEVICE}"

--- a/packages/wayland/weston11/package.mk
+++ b/packages/wayland/weston11/package.mk
@ -7,7 +7,7 @@ PKG_VERSION="11.0.3"
 PKG_LICENSE="MIT"
 PKG_SITE="https://wayland.freedesktop.org/"
 PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libxcb-cursor libinput pipewire cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xorg-server libXcursor xkbcomp setxkbmap cairo xterm"
+PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libxcb-cursor libinput pipewire cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xwayland libXcursor xkbcomp setxkbmap cairo xterm"
 PKG_LONGDESC="Reference implementation of a Wayland compositor"
 PKG_PATCH_DIRS+="${DEVICE}"

--- a/packages/x11/app/xterm/package.mk
+++ b/packages/x11/app/xterm/package.mk
@ -6,7 +6,7 @@ PKG_VERSION="379"
 PKG_LICENSE="MIT"
 PKG_SITE="http://invisible-mirror.net/archives/xterm"
 PKG_URL="${PKG_SITE}/${PKG_NAME}-${PKG_VERSION}.tgz"
-PKG_DEPENDS_TARGET="toolchain ncurses xorg-server libXaw libXpm"
+PKG_DEPENDS_TARGET="toolchain ncurses xwayland libXaw libXpm"
 PKG_LONGDESC="Terminal emulator for X11."


--- a/packages/x11/driver/xf86-input-evdev/package.mk
+++ b/packages/x11/driver/xf86-input-evdev/package.mk
@ -8,7 +8,7 @@ PKG_SHA256="8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain xorg-server util-macros libevdev mtdev systemd"
+PKG_DEPENDS_TARGET="toolchain xwayland util-macros libevdev mtdev systemd"
 PKG_LONGDESC="Evdev is an Xorg input driver for Linux's generic event devices."
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/driver/xf86-input-libinput/package.mk
+++ b/packages/x11/driver/xf86-input-libinput/package.mk
@ -8,7 +8,7 @@ PKG_SHA256="1446ba20a22bc968b5a4a0b4dbc3b8e037c50d9c59ac75fa3f7fc506c58c1abb"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.freedesktop.org/wiki/Software/libinput/"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libinput xorg-server"
+PKG_DEPENDS_TARGET="toolchain libinput xwayland"
 PKG_LONGDESC="This is an X driver based on libinput."
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/driver/xf86-input-synaptics/package.mk
+++ b/packages/x11/driver/xf86-input-synaptics/package.mk
@ -7,7 +7,7 @@ PKG_SHA256="b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38"
 PKG_LICENSE="GPL"
 PKG_SITE="https://lists.freedesktop.org/mailman/listinfo/xorg"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain xorg-server libXi libXext libevdev"
+PKG_DEPENDS_TARGET="toolchain xwayland libXi libXext libevdev"
 PKG_LONGDESC="Synaptics touchpad driver for X.Org."
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/driver/xf86-video-amdgpu/package.mk
+++ b/packages/x11/driver/xf86-video-amdgpu/package.mk
@ -9,7 +9,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.x.org/wiki/RadeonFeature/"
 PKG_URL="https://www.x.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libdrm xorg-server"
+PKG_DEPENDS_TARGET="toolchain libdrm xwayland"
 PKG_LONGDESC="Xorg driver for AMD Radeon GPUs using the amdgpu kernel driver."
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/driver/xf86-video-ati/package.mk
+++ b/packages/x11/driver/xf86-video-ati/package.mk
@ -9,7 +9,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.x.org/wiki/RadeonFeature/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain xorg-server"
+PKG_DEPENDS_TARGET="toolchain xwayland"
 PKG_LONGDESC="ATI/AMD Radeon video driver for the Xorg X server."
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/driver/xf86-video-intel/package.mk
+++ b/packages/x11/driver/xf86-video-intel/package.mk
@ -9,7 +9,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.x.org/wiki/IntelGraphicsDriver/"
 PKG_URL="https://gitlab.freedesktop.org/xorg/driver/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libXcomposite libXxf86vm libXdamage libdrm util-macros systemd xorg-server"
+PKG_DEPENDS_TARGET="toolchain libXcomposite libXxf86vm libXdamage libdrm util-macros systemd xwayland"
 PKG_LONGDESC="Open-source Xorg graphics driver for Intel graphics."
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk
@ -9,7 +9,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/"
 PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/${PKG_VERSION}/NVIDIA-Linux-x86_64-${PKG_VERSION}-no-compat32.run"
-PKG_DEPENDS_TARGET="util-macros xorg-server libvdpau"
+PKG_DEPENDS_TARGET="util-macros xwayland libvdpau"
 PKG_NEED_UNPACK="${LINUX_DEPENDS}"
 PKG_LONGDESC="The Xorg driver for NVIDIA GPUs supporting the GeForce 500 Series & older devices."

--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@ -12,7 +12,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="https://www.nvidia.com/en-us/drivers/unix/"
 PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/${PKG_VERSION}/NVIDIA-Linux-x86_64-${PKG_VERSION}-no-compat32.run"
-PKG_DEPENDS_TARGET="util-macros xorg-server libvdpau libglvnd"
+PKG_DEPENDS_TARGET="util-macros xwayland libvdpau libglvnd"
 PKG_LONGDESC="The Xorg driver for NVIDIA GPUs supporting the GeForce 600 Series & above."
 PKG_TOOLCHAIN="manual"

--- a/packages/x11/driver/xf86-video-vmware/package.mk
+++ b/packages/x11/driver/xf86-video-vmware/package.mk
@ -9,7 +9,7 @@ PKG_ARCH="x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.vmware.com"
 PKG_URL="https://xorg.freedesktop.org/releases/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain mesa libX11 xorg-server"
+PKG_DEPENDS_TARGET="toolchain mesa libX11 xwayland"
 PKG_LONGDESC="xf86-video-vmware: The Xorg driver for vmware video"
 PKG_TOOLCHAIN="autotools"

--- a/packages/x11/xserver/xorg-server/patches/xorg-server-100.01-detect-radeon.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-100.01-detect-radeon.patch
@ -1,22 +0,0 @@
-From 7b147dfef7a2ce8247710660d2b95d84100aaad7 Mon Sep 17 00:00:00 2001
-From: SupervisedThinking <supervisedthinking@gmail.com>
-Date: Tue, 19 Oct 2021 18:22:38 +0200
-Subject: [PATCH] Detect GPUs as "radeon" instead "ati"
-
---
- hw/xfree86/common/xf86pciBus.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index aeeed8be66..5c22bd4080 100644
--- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1106,7 +1106,7 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md)
-         driverList[0] = "ast";
-         break;
-     case 0x1002:
-        driverList[0] = "ati";
-+        driverList[0] = "radeon";
-         break;
-     case 0x102c:
-         driverList[0] = "chips";
--- a/packages/x11/xserver/xorg-server/patches/xorg-server-100.02-add-fedora-extra-modes-list.patch
+++ b/packages/x11/xserver/xorg-server/patches/xorg-server-100.02-add-fedora-extra-modes-list.patch
@ -1,90 +0,0 @@
-From aff7aded0cc546491b29b37b093846921ab7378a Mon Sep 17 00:00:00 2001
-From: SupervisedThinking <supervisedthinking@gmail.com>
-Date: Tue, 19 Oct 2021 18:23:20 +0200
-Subject: [PATCH] Fedora extra modes list added by Adam Jackson
- <ajax@redhat.com>
-
---
- hw/xfree86/common/extramodes | 59 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
-
-diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes
-index 006b5cba17..3caa3bf015 100644
--- a/hw/xfree86/common/extramodes
-+++ b/hw/xfree86/common/extramodes
-@@ -3,16 +3,75 @@
- //
- // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
- //
-+// NOTE:  Please keep all video modes sorted in order of X res, then Y res for
-+//        ease of maintenance and readability.
- 
- # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
- ModeLine "832x624" 57.284 832  864  928 1152  624  625  628  667 -Hsync -Vsync
- 
-+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
-+Modeline "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
-+
-+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz
-+Modeline "1152x864"  96.77  1152 1224 1344 1536  864 865 868 900  -HSync +Vsync
-+
-+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz
-+Modeline "1152x864"  104.99  1152 1224 1352 1552  864 865 868 902  -HSync +Vsync
-+
-+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
-+Modeline "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
-+
-+# 1152x864 @ 85Hz (Red Hat custom modeline)
-+ModeLine "1152x864"  121.5 1152 1216 1344 1568    864  865  868  911 +hsync -vsync
-+
-+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
-+Modeline "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
-+
-+# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz
-+Modeline "1360x768"   72.00  1360 1408 1440 1520  768 771 781 790 +hsync -vsync
-+
-+# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz
-+Modeline "1360x768"   84.75  1360 1432 1568 1776  768 771 781 798 -hsync +vsync
-+
- # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
- ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +hsync +vsync
- 
-+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz
-+Modeline "1400x1050"  145.06  1400 1496 1648 1896  1050 1051 1054 1093  -HSync +Vsync
-+
- # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
- ModeLine "1400x1050" 155.8 1400 1464 1784 1912   1050 1052 1064 1090 +hsync +vsync
- 
-+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
-+Modeline "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
-+
-+# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz
-+Modeline "1440x900"  106.50  1440 1520 1672 1904  900 903 909 934  -HSync +Vsync
-+
-+# 1600x1024 for SGI 1600 SW
-+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync
-+
-+# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz
-+Modeline "1680x1050"  119.00  1680 1728 1760 1840  1050 1053 1059 1080 +hsync -vsync
-+
-+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz
-+Modeline "1680x1050"  146.25  1680 1784 1960 2240  1050 1053 1059 1089 -hsync +vsync
-+
-+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz
-+Modeline "1680x1050"  174.00  1680 1800 1976 2272  1050 1053 1059 1096 -hsync +vsync
-+
-+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz
-+Modeline "1680x1050"  187.00  1680 1800 1976 2272  1050 1053 1059 1099 -hsync +vsync
-+
-+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz
-+Modeline "1680x1050"  214.75  1680 1808 1984 2288  1050 1053 1059 1105 -hsync +vsync
-+
-+# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz
-+Modeline "1920x1080"  138.50  1920 1968 2000 2080  1080 1083 1088 1111 +hsync -vsync
-+
-+# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz
-+Modeline "1920x1200"  154.00  1920 1968 2000 2080  1200 1203 1209 1235 +hsync -vsync
-+
- # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
- Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
- 
--- a/packages/x11/xserver/xorg-server/debug.d/xorg.conf
+++ b/packages/x11/xserver/xorg-server/debug.d/xorg.conf
--- a/packages/x11/xserver/xorg-server/package.mk
+++ b/packages/x11/xserver/xorg-server/package.mk
@ -2,36 +2,20 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

-PKG_NAME="xorg-server"
-PKG_VERSION="7b1758936bd644020a560f2739ad7a50fbb87b17"
+PKG_NAME="xwayland"
+PKG_VERSION="7883646a8f208a1db4cb98f8b295c7f862da3b2a"
 PKG_LICENSE="OSS"
 PKG_SITE="https://gitlab.freedesktop.org/xorg/xserver"
 PKG_URL="${PKG_SITE}.git"
-PKG_DEPENDS_TARGET="toolchain util-macros font-util xorgproto libpciaccess libX11 libXfont2 libXinerama libxcvt libxshmfence libxkbfile libdrm openssl freetype pixman systemd xorg-launch-helper"
+PKG_GIT_CLONE_BRANCH="xwayland-23.2"
+PKG_DEPENDS_TARGET="toolchain util-macros font-util xorgproto libpciaccess libX11 libXfont2 libXinerama libxcvt libxshmfence libxkbfile libdrm openssl freetype pixman systemd xorg-launch-helper wayland libglvnd"
 PKG_NEED_UNPACK="$(get_pkg_directory xf86-video-nvidia) $(get_pkg_directory xf86-video-nvidia-legacy)"
 PKG_LONGDESC="X.Org Server is the free and open-source implementation of the X Window System display server."

 get_graphicdrivers

-if [ "${DISPLAYSERVER}" = "wl" ]
-then
-PKG_DEPENDS_TARGET+=" wayland libglvnd"
-PKG_MESON_OPTS_TARGET+=" -Dxorg=false \
-                         -Dxwayland=true \
-                         -Dglamor=true"
-else
-PKG_MESON_OPTS_TARGET+=" -Dxorg=true \
-                         -Dxwayland=false"
-fi
-
-PKG_MESON_OPTS_TARGET+=" -Dxephyr=false \
-                       -Dxnest=false \
-                       -Dxvfb=false \
-                       -Dxwin=false \
-                       -Dxquartz=false \
+PKG_MESON_OPTS_TARGET+=" -Dxvfb=false \
                       -Dbuilder_addr=${BUILDER_NAME} \
-                       -Dlog_dir="/var/log" \
-                       -Dmodule_dir=${XORG_PATH_MODULES} \
                       -Ddefault_font_path="/usr/share/fonts/misc,built-ins" \
                       -Dxdmcp=false \
                       -Dxdm-auth-1=false \
@ -46,13 +30,6 @@ PKG_MESON_OPTS_TARGET+=" -Dxephyr=false \
                       -Dlisten_tcp=false \
                       -Dlisten_unix=true \
                       -Dlisten_local=false \
-                       -Dint10=x86emu \
-                       -Dpciaccess=true \
-                       -Dudev=true \
-                       -Dudev_kms=true \
-                       -Dhal=false \
-                       -Dsystemd_logind=false \
-                       -Dvgahw=true \
                       -Ddpms=true \
                       -Dxf86bigfont=false \
                       -Dscreensaver=false \
@ -62,16 +39,10 @@ PKG_MESON_OPTS_TARGET+=" -Dxephyr=false \
                       -Dxinerama=true \
                       -Dxcsecurity=false \
                       -Dxv=true \
-                       -Dxvmc=false \
-                       -Ddga=true \
-                       -Dlinux_apm=false \
-                       -Dlinux_acpi=false \
                       -Dmitshm=true \
                       -Dsha1="libcrypto" \
-                       -Ddri2=true \
                       -Ddri3=true \
                       -Ddrm=true \
-                       -Dxpbproxy=false \
                       -Dlibunwind=false \
                       -Ddocs=false \
                       -Ddevel-docs=false"
@ -79,7 +50,6 @@ PKG_MESON_OPTS_TARGET+=" -Dxephyr=false \
 if [ ! "${OPENGL}" = "no" ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGL} libepoxy"
  PKG_MESON_OPTS_TARGET+=" -Dglx=true \
-                           -Ddri1=true \
                           -Dglamor=true"
 else
  PKG_MESON_OPTS_TARGET+=" -Dglx=false \
--- a/packages/x11/xserver/xorg-server/profile.d/045-xorg-server.conf
+++ b/packages/x11/xserver/xorg-server/profile.d/045-xorg-server.conf
--- a/packages/x11/xserver/xorg-server/scripts/xorg-configure
+++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure
--- a/packages/x11/xserver/xorg-server/system.d/xorg-configure@.service
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-configure@.service
--- a/packages/x11/xserver/xorg-server/system.d/xorg.service
+++ b/packages/x11/xserver/xorg-server/system.d/xorg.service
--- a/packages/x11/xserver/xorg-server/tmpfiles.d/z_90_xorg-server.conf
+++ b/packages/x11/xserver/xorg-server/tmpfiles.d/z_90_xorg-server.conf
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
--- a/projects/Amlogic/packages/linux/package.mk
+++ b/projects/Amlogic/packages/linux/package.mk
@ -7,7 +7,7 @@
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/JustEnoughLinuxOS"
-PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
+PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host rdfind:host"
 PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils util-linux binutils ncurses openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_DEPENDS_INIT="toolchain"
 PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"
--- a/projects/Rockchip/packages/linux/package.mk
+++ b/projects/Rockchip/packages/linux/package.mk
@ -7,7 +7,7 @@
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/JustEnoughLinuxOS"
-PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"
+PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host rdfind:host"
 PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host lz4:host wireless-regdb keyutils util-linux binutils ncurses openssl:host ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_DEPENDS_INIT="toolchain"
 PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)"