12 files changed, 65 insertions, 10 deletions
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh
index 8d557bbe6..daa83a632 100755
--- a/source/x/vulkan-sdk/fetch-sources.sh
+++ b/source/x/vulkan-sdk/fetch-sources.sh
@@ -27,8 +27,8 @@
 #
 # Example:  VERSION=1.1.92.1 ./fetch-sources.sh
 
-VERSION=${VERSION:-1.2.131.2}
-BRANCH=${BRANCH:-sdk-1.2.131}
+VERSION=${VERSION:-1.2.135.0}
+BRANCH=${BRANCH:-sdk-1.2.135}
 
 rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \
 	Vulkan-Headers-sdk-${VERSION}* \
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index ec635144f..f599e28b8 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-9
+10
diff --git a/source/x/x11/build/xisxwayland b/source/x/x11/build/xisxwayland
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/x/x11/build/xisxwayland
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/configure/xisxwayland b/source/x/x11/configure/xisxwayland
new file mode 100644
index 000000000..cd149401c
--- /dev/null
+++ b/source/x/x11/configure/xisxwayland
@@ -0,0 +1,17 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd 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 \
+  .. || exit 1
diff --git a/source/x/x11/make/xisxwayland b/source/x/x11/make/xisxwayland
new file mode 100644
index 000000000..b22bc0de1
--- /dev/null
+++ b/source/x/x11/make/xisxwayland
@@ -0,0 +1,6 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+cd build
+  ninja || exit 1
+  DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 94d7fe7c3..077288f2b 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -233,6 +233,7 @@ xhost
 xineramaproto
 xinit
 xinput
+xisxwayland
 xkbcomp
 xkbevd
 xkbprint
diff --git a/source/x/x11/slack-desc/xisxwayland b/source/x/x11/slack-desc/xisxwayland
new file mode 100644
index 000000000..b155cfe5a
--- /dev/null
+++ b/source/x/x11/slack-desc/xisxwayland
@@ -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------------------------------------------------------|
+xisxwayland: xisxwayland (determine if Xwayland is in use)
+xisxwayland:
+xisxwayland: xisxwayland is a tool to be used within shell scripts to determine
+xisxwayland: whether the X server in use is Xwayland. It exits with status 0 if
+xisxwayland: the server is an Xwayland server and 1 otherwise. Any error results
+xisxwayland: in an exit code of 3.
+xisxwayland:
+xisxwayland:
+xisxwayland:
+xisxwayland:
+xisxwayland:
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index 301ec1b67..641a50c19 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019, 2020  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sane
-VERSION=1.0.29
-BACKVER=1.0.29
+VERSION=1.0.30
+BACKVER=1.0.30
 FRONTVER=1.0.14
 BUILD=${BUILD:-1}
 
@@ -120,6 +120,14 @@ cat tools/udev/libsane.rules \
 install -D -m644 tools/sane-backends.pc \
      $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 # Now let's build the frontends:
 cd $TMP 
 rm -rf sane-frontends-$FRONTVER
@@ -182,10 +190,12 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
+# Do not include ancient ChangeLogs:
+rm -rf $PKG/usr/doc/${PKGNAM}-$VERSION/ChangeLogs
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/sane-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/sane/sane.url b/source/xap/sane/sane.url
new file mode 100644
index 000000000..a5d74eaa5
--- /dev/null
+++ b/source/xap/sane/sane.url
@@ -0,0 +1 @@
+http://www.sane-project.org/source.html
diff --git a/source/xap/sane/slack-desc b/source/xap/sane/slack-desc
index 44ef6348e..b123e8bfd 100644
--- a/source/xap/sane/slack-desc
+++ b/source/xap/sane/slack-desc
@@ -13,7 +13,7 @@ sane: access to any raster image scanner hardware, such as flatbed scanners,
 sane: hand-held scanners, video and still cameras, frame-grabbers, and other
 sane: similar devices.
 sane:
-sane:
+sane: Homepage: http://www.sane-project.org
 sane:
 sane:
 sane:
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index 25322d6c6..68d9e2984 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xlockmore
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index cb9c10cdb..5fbbcd92e 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xscreensaver
 VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then