7 files changed, 37 insertions, 2 deletions
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 1ebd63465..0501d2b6c 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -6,6 +6,7 @@ BUILD_SERVERS="--enable-xorg \
   --enable-glamor \
   --enable-kdrive \
   --enable-xephyr \
+  --enable-xwayland \
   --enable-config-udev \
   --disable-config-hal \
   --disable-systemd-logind"
diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server
index 13d601edc..cc4f4f78d 100644
--- a/source/x/x11/makepkg/xorg-server
+++ b/source/x/x11/makepkg/xorg-server
@@ -29,6 +29,17 @@ cat $CWD/slack-desc/xorg-server-xephyr > ${SLACK_X_BUILD_DIR}/package-xorg-serve
 cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr
 /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
 
+rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
+mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
+mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
+# No man page yet...
+#mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
+#mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
+mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install
+cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc
+cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
+/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+
 # Build the main xorg-server package:
 cd $PKG
 /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
@@ -37,11 +48,13 @@ if [ "$UPGRADE_PACKAGES" = "yes" ]; then
   /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
   /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
   /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+  /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
   /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
 elif [ "$UPGRADE_PACKAGES" = "always" ]; then
   /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
   /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
   /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+  /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
   /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
 fi
 
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 4f7ebec0f..94d7fe7c3 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -256,6 +256,7 @@ xorg-server
 xorg-server-xephyr
 xorg-server-xnest
 xorg-server-xvfb
+xorg-server-xwayland
 xorg-sgml-doctools
 xorgproto
 xpr
diff --git a/source/x/x11/slack-desc/xorg-server b/source/x/x11/slack-desc/xorg-server
index a67825a67..981a1a3dc 100644
--- a/source/x/x11/slack-desc/xorg-server
+++ b/source/x/x11/slack-desc/xorg-server
@@ -16,4 +16,4 @@ xorg-server: 4.4rc2  release. The XFree86 release was originally derived from X3
 xorg-server: 1.2 by Thomas Roell which was contributed to X11R5 by Snitily Graphics
 xorg-server: Consulting Service.
 xorg-server:
-xorg-server: The home page for the X project is:  http://www.x.org
+xorg-server: Homepage:  https://www.x.org
diff --git a/source/x/x11/slack-desc/xorg-server-xwayland b/source/x/x11/slack-desc/xorg-server-xwayland
new file mode 100644
index 000000000..7a292b27a
--- /dev/null
+++ b/source/x/x11/slack-desc/xorg-server-xwayland
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+                    |-----handy-ruler------------------------------------------------------|
+xorg-server-xwayland: xorg-server-xwayland (X Clients under Wayland)
+xorg-server-xwayland:
+xorg-server-xwayland: Wayland is a complete window system in itself, but even so, if we're
+xorg-server-xwayland: migrating away from X, it makes sense to have a good backwards
+xorg-server-xwayland: compatibility story. With a few changes, the Xorg server can be
+xorg-server-xwayland: modified to use Wayland input devices for input and forward either the
+xorg-server-xwayland: root window or individual top-level windows as wayland surfaces. The
+xorg-server-xwayland: server still runs the same 2D driver with the same acceleration code
+xorg-server-xwayland: as it does when it runs natively. The main difference is that Wayland
+xorg-server-xwayland: handles presentation of the windows instead of KMS.
+xorg-server-xwayland:
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild
index f46228738..8455b4a7d 100755
--- a/source/x/x11/x11.SlackBuild
+++ b/source/x/x11/x11.SlackBuild
@@ -208,6 +208,7 @@ no_usr_share_doc() {
             echo "xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
             echo "xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
             echo "xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+            echo "xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
             echo "xorg-server-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
           fi
           continue