7 files changed, 43 insertions, 23 deletions
diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild
index 54b37bada..531de3ff3 100755
--- a/source/x/libinput/libinput.SlackBuild
+++ b/source/x/libinput/libinput.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libinput
 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/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild
index 26bf10512..50b694591 100755
--- a/source/x/libva/libva.SlackBuild
+++ b/source/x/libva/libva.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libva
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild
index 207b2374f..2ea9abb4f 100755
--- a/source/x/libwacom/libwacom.SlackBuild
+++ b/source/x/libwacom/libwacom.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libwacom
 
 # Copyright 2015  Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2018, 2022  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -79,24 +79,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --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 \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-static \
-  --with-udev-dir=/lib/udev \
-  --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
+  --buildtype=release \
+  -Dudev-dir=/lib/udev \
+  -Dtests=disabled \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild
index 5afd9e15c..fe6deb80f 100755
--- a/source/x/motif/motif.SlackBuild
+++ b/source/x/motif/motif.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2014, 2016, 2018, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=motif
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d - | cut -f 1-3 -d .)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -107,7 +107,8 @@ zcat $CWD/motif.rgbtxt.patch.gz | patch -p1 --verbose || exit 1
 autoreconf -vif
 
 # Configure:
-LDFLAGS="$SLKLDFLAGS" \
+LEXLIB="-lfl" \
+LDFLAGS="-Wl,-O1,--as-needed" \
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/x/vulkan-sdk/gfxreconstruct-sdk.glibc-2.35.diff b/source/x/vulkan-sdk/gfxreconstruct-sdk.glibc-2.35.diff
new file mode 100644
index 000000000..0e94795eb
--- /dev/null
+++ b/source/x/vulkan-sdk/gfxreconstruct-sdk.glibc-2.35.diff
@@ -0,0 +1,11 @@
+--- ./framework/util/page_guard_manager.cpp.orig	2021-06-15 14:04:31.000000000 -0500
++++ ./framework/util/page_guard_manager.cpp	2022-02-12 18:53:36.586025716 -0600
+@@ -110,7 +110,7 @@
+ static struct sigaction s_old_sigaction = {};
+ static stack_t          s_old_stack     = {};
+ 
+-static uint8_t s_alt_stack[SIGSTKSZ];
++static uint8_t s_alt_stack[_SC_SIGSTKSZ];
+ 
+ static void PageGuardExceptionHandler(int id, siginfo_t* info, void* data)
+ {
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 72a86f7d2..1c9afe4d1 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=vulkan-sdk
 # The ./VERSION file is created by ./fetch-sources.sh:
 VERSION=${VERSION:-$(cat VERSION)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -450,6 +450,9 @@ cd $TMP
 tar xvf $CWD/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1
 cd $TMP/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION
 
+# patch to build with glibc-2.34:
+zcat $CWD/gfxreconstruct-sdk.glibc-2.35.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom
index 0cfbf0888..d00491fd7 100644
--- a/source/x/x11/build/xf86-input-wacom
+++ b/source/x/x11/build/xf86-input-wacom
@@ -1 +1 @@
-2
+1