Thu Feb 20 04:50:54 UTC 202020200220045054

a/gptfdisk-1.0.5-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20200219_2277987-noarch-1.txz:  Upgraded.
a/kernel-generic-5.4.21-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.21-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.21-x86_64-1.txz:  Upgraded.
a/shadow-4.8.1-x86_64-5.txz:  Rebuilt.
a/util-linux-2.35.1-x86_64-4.txz:  Rebuilt.
ap/cdparanoia-III_10.2-x86_64-3.txz:  Rebuilt.
  Moved man page from /usr/man/jp/man1/ to /usr/man/ja/man1/. Thanks to Xsane.
  Don't ship the static libraries.
d/kernel-headers-5.4.21-x86-1.txz:  Upgraded.
k/kernel-source-5.4.21-noarch-1.txz:  Upgraded.
   SND_SOC n -> m
   SPI n -> y
   VFIO_PCI_VGA n -> y
  +ADE7854_SPI m
  +ADT7316_SPI m
  +BMC150_ACCEL_SPI m
  +BMG160_SPI m
  +BMP280_SPI m
  +FXAS21002C_SPI m
  +HTS221_SPI m
  +IIO_ST_ACCEL_SPI_3AXIS m
  +IIO_ST_GYRO_SPI_3AXIS m
  +IIO_ST_MAGN_SPI_3AXIS m
  +IIO_ST_PRESS_SPI m
  +IIO_ST_SENSORS_SPI m
  +INPUT_AD714X_SPI m
  +INPUT_ADXL34X_SPI m
  +KXSD9_SPI m
  +REGMAP_SPI m
  +SND_COMPRESS_OFFLOAD m
  +SND_DESIGNWARE_I2S m
  +SND_DESIGNWARE_PCM y
  +SND_DMAENGINE_PCM m
  +SND_HDA_EXT_CORE m
  +SND_I2S_HI6210_I2S m
  +SND_PCM_ELD y
  +SND_PCM_IEC958 y
  +SND_SIMPLE_CARD m
  +SND_SIMPLE_CARD_UTILS m
  +SND_SOC_AC97_BUS y
  +SND_SOC_AC97_CODEC m
  +SND_SOC_ACPI m
  +SND_SOC_ACPI_INTEL_MATCH m
  +SND_SOC_ADAU1761 m
  +SND_SOC_ADAU1761_I2C m
  +SND_SOC_ADAU1761_SPI m
  +SND_SOC_ADAU17X1 m
  +SND_SOC_ADAU7002 m
  +SND_SOC_ADAU_UTILS m
  +SND_SOC_AMD_ACP m
  +SND_SOC_AMD_ACP3x m
  +SND_SOC_AMD_CZ_DA7219MX98357_MACH m
  +SND_SOC_AMD_CZ_RT5645_MACH m
  +SND_SOC_BD28623 m
  +SND_SOC_COMPRESS y
  +SND_SOC_CROS_EC_CODEC m
  +SND_SOC_CS35L34 m
  +SND_SOC_CS35L35 m
  +SND_SOC_CS35L36 m
  +SND_SOC_CS42L42 m
  +SND_SOC_CS43130 m
  +SND_SOC_CX2072X m
  +SND_SOC_DA7213 m
  +SND_SOC_DA7219 m
  +SND_SOC_DMIC m
  +SND_SOC_ES7134 m
  +SND_SOC_ES7241 m
  +SND_SOC_ES8316 m
  +SND_SOC_ES8328 m
  +SND_SOC_ES8328_I2C m
  +SND_SOC_ES8328_SPI m
  +SND_SOC_GENERIC_DMAENGINE_PCM y
  +SND_SOC_HDAC_HDA m
  +SND_SOC_HDAC_HDMI m
  +SND_SOC_HDMI_CODEC m
  +SND_SOC_I2C_AND_SPI m
  +SND_SOC_INTEL_APL m
  +SND_SOC_INTEL_BDW_RT5677_MACH m
  +SND_SOC_INTEL_BROADWELL_MACH m
  +SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH m
  +SND_SOC_INTEL_BXT_RT298_MACH m
  +SND_SOC_INTEL_BYTCR_RT5640_MACH m
  +SND_SOC_INTEL_BYTCR_RT5651_MACH m
  +SND_SOC_INTEL_BYT_CHT_CX2072X_MACH m
  +SND_SOC_INTEL_BYT_CHT_DA7213_MACH m
  +SND_SOC_INTEL_BYT_CHT_ES8316_MACH m
  +SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH m
  +SND_SOC_INTEL_CFL m
  +SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH m
  +SND_SOC_INTEL_CHT_BSW_NAU8824_MACH m
  +SND_SOC_INTEL_CHT_BSW_RT5645_MACH m
  +SND_SOC_INTEL_CHT_BSW_RT5672_MACH m
  +SND_SOC_INTEL_CML_H m
  +SND_SOC_INTEL_CML_LP m
  +SND_SOC_INTEL_CNL m
  +SND_SOC_INTEL_DA7219_MAX98357A_GENERIC m
  +SND_SOC_INTEL_GLK m
  +SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH m
  +SND_SOC_INTEL_HASWELL m
  +SND_SOC_INTEL_HASWELL_MACH m
  +SND_SOC_INTEL_KBL m
  +SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH m
  +SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH m
  +SND_SOC_INTEL_KBL_RT5660_MACH m
  +SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH m
  +SND_SOC_INTEL_MACH y
  +SND_SOC_INTEL_SKL m
  +SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH m
  +SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH m
  +SND_SOC_INTEL_SKL_RT286_MACH m
  +SND_SOC_INTEL_SKYLAKE m
  +SND_SOC_INTEL_SKYLAKE_COMMON m
  +SND_SOC_INTEL_SKYLAKE_FAMILY m
  +SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC y
  +SND_SOC_INTEL_SKYLAKE_SSP_CLK m
  +SND_SOC_INTEL_SST m
  +SND_SOC_INTEL_SST_ACPI m
  +SND_SOC_INTEL_SST_FIRMWARE m
  +SND_SOC_INTEL_SST_TOPLEVEL y
  +SND_SOC_MAX9759 m
  +SND_SOC_MAX98088 m
  +SND_SOC_MAX98090 m
  +SND_SOC_MAX98357A m
  +SND_SOC_MAX98373 m
  +SND_SOC_MAX9867 m
  +SND_SOC_MAX98927 m
  +SND_SOC_NAU8540 m
  +SND_SOC_NAU8824 m
  +SND_SOC_NAU8825 m
  +SND_SOC_PCM1789 m
  +SND_SOC_PCM1789_I2C m
  +SND_SOC_PCM186X m
  +SND_SOC_PCM186X_I2C m
  +SND_SOC_PCM186X_SPI m
  +SND_SOC_PCM3060 m
  +SND_SOC_PCM3060_I2C m
  +SND_SOC_PCM3060_SPI m
  +SND_SOC_RL6231 m
  +SND_SOC_RL6347A m
  +SND_SOC_RT286 m
  +SND_SOC_RT298 m
  +SND_SOC_RT5640 m
  +SND_SOC_RT5645 m
  +SND_SOC_RT5651 m
  +SND_SOC_RT5660 m
  +SND_SOC_RT5663 m
  +SND_SOC_RT5670 m
  +SND_SOC_RT5677 m
  +SND_SOC_RT5677_SPI m
  +SND_SOC_RT5682 m
  +SND_SOC_SIGMADSP m
  +SND_SOC_SIGMADSP_REGMAP m
  +SND_SOC_SIMPLE_AMPLIFIER m
  +SND_SOC_SOF m
  +SND_SOC_SOF_ACPI m
  +SND_SOC_SOF_APOLLOLAKE m
  +SND_SOC_SOF_APOLLOLAKE_SUPPORT y
  +SND_SOC_SOF_BAYTRAIL m
  +SND_SOC_SOF_BAYTRAIL_SUPPORT y
  +SND_SOC_SOF_CANNONLAKE m
  +SND_SOC_SOF_CANNONLAKE_SUPPORT y
  +SND_SOC_SOF_COFFEELAKE m
  +SND_SOC_SOF_COFFEELAKE_SUPPORT y
  +SND_SOC_SOF_COMETLAKE_H m
  +SND_SOC_SOF_COMETLAKE_H_SUPPORT y
  +SND_SOC_SOF_COMETLAKE_LP m
  +SND_SOC_SOF_COMETLAKE_LP_SUPPORT y
  +SND_SOC_SOF_ELKHARTLAKE m
  +SND_SOC_SOF_ELKHARTLAKE_SUPPORT y
  +SND_SOC_SOF_GEMINILAKE m
  +SND_SOC_SOF_GEMINILAKE_SUPPORT y
  +SND_SOC_SOF_HDA m
  +SND_SOC_SOF_HDA_AUDIO_CODEC y
  +SND_SOC_SOF_HDA_COMMON m
  +SND_SOC_SOF_HDA_LINK y
  +SND_SOC_SOF_HDA_LINK_BASELINE m
  +SND_SOC_SOF_ICELAKE m
  +SND_SOC_SOF_ICELAKE_SUPPORT y
  +SND_SOC_SOF_INTEL_ACPI m
  +SND_SOC_SOF_INTEL_ATOM_HIFI_EP m
  +SND_SOC_SOF_INTEL_COMMON m
  +SND_SOC_SOF_INTEL_HIFI_EP_IPC m
  +SND_SOC_SOF_INTEL_PCI m
  +SND_SOC_SOF_INTEL_TOPLEVEL y
  +SND_SOC_SOF_MERRIFIELD m
  +SND_SOC_SOF_MERRIFIELD_SUPPORT y
  +SND_SOC_SOF_OPTIONS m
  +SND_SOC_SOF_PCI m
  +SND_SOC_SOF_PROBE_WORK_QUEUE y
  +SND_SOC_SOF_TIGERLAKE m
  +SND_SOC_SOF_TIGERLAKE_SUPPORT y
  +SND_SOC_SOF_TOPLEVEL y
  +SND_SOC_SOF_XTENSA m
  +SND_SOC_SPDIF m
  +SND_SOC_SSM4567 m
  +SND_SOC_TAS6424 m
  +SND_SOC_TDA7419 m
  +SND_SOC_TLV320AIC32X4 m
  +SND_SOC_TLV320AIC32X4_I2C m
  +SND_SOC_TLV320AIC32X4_SPI m
  +SND_SOC_TOPOLOGY y
  +SND_SOC_TS3A227E m
  +SND_SOC_TSCS42XX m
  +SND_SOC_WM8524 m
  +SND_SPI y
  +SND_SST_ATOM_HIFI2_PLATFORM m
  +SND_SST_ATOM_HIFI2_PLATFORM_ACPI m
  +SND_SST_ATOM_HIFI2_PLATFORM_PCI m
  +SND_SST_IPC m
  +SND_SST_IPC_ACPI m
  +SND_SST_IPC_PCI m
  +SPI_MASTER y
  +ST_UVIS25_SPI m
l/gegl-0.4.22-x86_64-1.txz:  Upgraded.
l/glib2-2.62.5-x86_64-1.txz:  Upgraded.
l/python-requests-2.23.0-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.22.8-x86_64-1.txz:  Upgraded.
n/openssh-8.2p1-x86_64-2.txz:  Rebuilt.
n/php-7.4.3-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues:
  Phar: Files added to tar with Phar::buildFromIterator have
  all-access permissions.
  Phar: heap-buffer-overflow in phar_extract_file.
  Session: Null Pointer Dereference in PHP Session Upload Progress.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7063
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7061
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7062
  (* Security fix *)
x/mesa-20.0.0-x86_64-1.txz:  Upgraded.
  Added Wayland platform support.
x/wayland-1.18.0-x86_64-1.txz:  Added.
x/wayland-protocols-1.18-noarch-1.txz:  Added.
x/xorg-server-1.20.7-x86_64-2.txz:  Rebuilt.
x/xorg-server-xephyr-1.20.7-x86_64-2.txz:  Rebuilt.
x/xorg-server-xnest-1.20.7-x86_64-2.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.7-x86_64-2.txz:  Rebuilt.
x/xorg-server-xwayland-1.20.7-x86_64-2.txz:  Added.
xap/gimp-2.10.16-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/PAM/openssh-8.2p1-x86_64-2_pam.txz:  Rebuilt.
  /etc/pam.d/sshd: add commented out pam_tally2 example.
testing/packages/PAM/shadow-4.8.1-x86_64-5_pam.txz:  Rebuilt.
  /etc/pam.d/system-auth: add support for pam_group, remove pam_tally2.
  Thanks to ivandi.
  /etc/pam.d/*: Don't use tabs.
testing/packages/PAM/util-linux-2.35.1-x86_64-4_pam.txz:  Rebuilt.
  /etc/pam.d/login: add commented out pam_tally2 example.
  /etc/pam.d/*: Don't use tabs.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

15 files changed, 339 insertions, 65 deletions

diff --git a/source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch b/source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch
deleted file mode 100644
index 03542cc4..00000000
--- a/source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4656d2d30a8c176d81f31827302cd082eff59de3 Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee@freedesktop.org>
-Date: Sat, 1 Feb 2020 01:12:32 -0800
-Subject: [PATCH] swr: Fix GCC 4.9 checks.
-
-Fixes: f0a22956be48 ("swr/rast: _mm*_undefined_* implementations for gcc<4.9")
-Fixes: e21fc2c62527 ("swr/rast: non-regex knob fallback code for gcc < 4.9")
-Signed-off-by: Vinson Lee <vlee@freedesktop.org>
-Reviewed-by: Jan Zielinski <jan.zielinski@intel.com>
-(cherry picked from commit deb2bbf57ec1d0660dd85b7080bf5ebeb10e8768)
----
- .pick_status.json                                               | 2 +-
- .../drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp      | 2 +-
- src/gallium/drivers/swr/rasterizer/common/os.h                  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/.pick_status.json b/.pick_status.json
-index a442be492f4..af4f23fb12f 100644
---- a/.pick_status.json
-+++ b/.pick_status.json
-@@ -319,7 +319,7 @@
-         "description": "swr: Fix GCC 4.9 checks.",
-         "nominated": true,
-         "nomination_type": 1,
--        "resolution": 0,
-+        "resolution": 1,
-         "master_sha": null,
-         "because_sha": "f0a22956be4802e01f2b4f3244f011212626f12d"
-     },
-diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-index 1ef83ad10d1..b073f73e3a0 100644
---- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-+++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
-@@ -43,7 +43,7 @@
- //========================================================
- void KnobBase::autoExpandEnvironmentVariables(std::string& text)
- {
--#if (__GNUC__) && (GCC_VERSION < 409000)
-+#if (__GNUC__) && (GCC_VERSION < 40900)
-     // <regex> isn't implemented prior to gcc-4.9.0
-     // unix style variable replacement
-     size_t start;
-diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
-index e812da39851..7d33f6d99d6 100644
---- a/src/gallium/drivers/swr/rasterizer/common/os.h
-+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
-@@ -182,7 +182,7 @@ static INLINE void _mm256_storeu2_m128i(__m128i* hi, __m128i* lo, __m256i a)
- }
- 
- // gcc prior to 4.9 doesn't have _mm*_undefined_*
--#if (__GNUC__) && (GCC_VERSION < 409000)
-+#if (__GNUC__) && (GCC_VERSION < 40900)
- #define _mm_undefined_si128 _mm_setzero_si128
- #define _mm256_undefined_ps _mm256_setzero_ps
- #endif
--- 
-2.25.0
-
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index a987721f..da435062 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mesa
 VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 BUILD_DEMOS=${BUILD_DEMOS:-YES}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -101,9 +101,6 @@ if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
   done
 fi
 
-# Revert a patch causing illegal instruction crashes starting X:
-zcat $CWD/0001-swr-Fix-GCC-4.9-checks.patch.gz | patch -R -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -121,7 +118,7 @@ meson setup \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --buildtype=release \
-  -Dplatforms=x11,drm,surfaceless \
+  -Dplatforms=x11,drm,surfaceless,wayland \
   -Dgallium-opencl=icd \
   -Dgallium-nine=true \
   -Dosmesa=gallium \
diff --git a/source/x/wayland-protocols/slack-desc b/source/x/wayland-protocols/slack-desc
new file mode 100644
index 00000000..35fc9fe3
--- /dev/null
+++ b/source/x/wayland-protocols/slack-desc
@@ -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 ':' except on otherwise blank lines.
+
+                 |-----handy-ruler------------------------------------------------------|
+wayland-protocols: wayland-protocols (extended Wayland protocols)
+wayland-protocols:
+wayland-protocols: wayland-protocols contains Wayland protocols that add functionality
+wayland-protocols: not available in the Wayland core protocol. Such protocols either add
+wayland-protocols: completely new functionality, or extend the functionality of some
+wayland-protocols: other protocol either in Wayland core or in wayland-protocols.
+wayland-protocols:
+wayland-protocols: Homepage: https://wayland.freedesktop.org/
+wayland-protocols:
+wayland-protocols:
+wayland-protocols:
diff --git a/source/x/wayland-protocols/wayland-protocols.SlackBuild b/source/x/wayland-protocols/wayland-protocols.SlackBuild
new file mode 100755
index 00000000..00b862d6
--- /dev/null
+++ b/source/x/wayland-protocols/wayland-protocols.SlackBuild
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+# Copyright 2017, 2019  Eric Hameleers, Eindhoven, NL
+# Copyright 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=wayland-protocols
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Note: the package is _built_ as 'noarch'
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-noarch-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  COPYING* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-noarch-$BUILD.txz
diff --git a/source/x/wayland-protocols/wayland-protocols.url b/source/x/wayland-protocols/wayland-protocols.url
new file mode 100644
index 00000000..e7383601
--- /dev/null
+++ b/source/x/wayland-protocols/wayland-protocols.url
@@ -0,0 +1 @@
+https://wayland.freedesktop.org/releases.html
diff --git a/source/x/wayland/slack-desc b/source/x/wayland/slack-desc
new file mode 100644
index 00000000..b99ce6db
--- /dev/null
+++ b/source/x/wayland/slack-desc
@@ -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 ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+wayland: wayland (Wayland display server)
+wayland:
+wayland: Wayland is protocol for a compositor to talk to its clients as well
+wayland: as a library implementation of the protocol. The compositor can be
+wayland: a standalone display server running on Linux kernel modesetting and
+wayland: evdev input devices, an X application, or a wayland client itself.
+wayland: The clients can be traditional applications, X servers (rootless or
+wayland: fullscreen) or other display servers.
+wayland:
+wayland: Homepage: https://wayland.freedesktop.org/
+wayland:
diff --git a/source/x/wayland/wayland.SlackBuild b/source/x/wayland/wayland.SlackBuild
new file mode 100755
index 00000000..866f2d43
--- /dev/null
+++ b/source/x/wayland/wayland.SlackBuild
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Copyright 2015, 2017, 2019  Eric Hameleers, Eindhoven, NL
+# Copyright 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=wayland
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
+  --prefix=/usr \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --buildtype=release \
+  -Ddocumentation=false \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  CONTRIBUTING* COPYING* README* TODO* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/wayland/wayland.url b/source/x/wayland/wayland.url
new file mode 100644
index 00000000..e7383601
--- /dev/null
+++ b/source/x/wayland/wayland.url
@@ -0,0 +1 @@
+https://wayland.freedesktop.org/releases.html
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd..0cfbf088 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 1ebd6346..0501d2b6 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 13d601ed..cc4f4f78 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 4f7ebec0..94d7fe7c 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 a67825a6..981a1a3d 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 00000000..7a292b27
--- /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 f4622873..8455b4a7 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