Thu Jan 19 21:07:32 UTC 202320230119210732

a/pkgtools-15.1-noarch-4.txz:  Rebuilt.
  makepkg: also let xz decide how many threads to use on ARM platforms aarch64
  and riscv64. Thanks to Stuart Winter.
  installpkg: fix reversed test for if a --threads option was given. It appears
  that it's been wrong for years but since xz didn't support threaded
  decompression yet it wasn't noticed.
a/xz-5.4.1-x86_64-2.txz:  Rebuilt.
  Reduce default verbosity from V_WARNING to V_ERROR to avoid sending non-fatal
  memory usage information to stderr.
kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz:  Upgraded.
l/exiv2-0.27.6-x86_64-1.txz:  Upgraded.
l/tdb-1.4.8-x86_64-1.txz:  Upgraded.
x/igt-gpu-tools-1.27.1-x86_64-1.txz:  Upgraded.
x/libX11-1.8.3-x86_64-2.txz:  Rebuilt.
  [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11
  Thanks to marav.

5 files changed, 22 insertions, 8 deletions

diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 67058d409..ab2f57334 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.1
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # 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
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index 64791afc6..c5c6ee2af 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -360,7 +360,7 @@ if [ "$MODE" = "warn" ]; then
       fi
       ;;
     'txz' )
-      if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then
+      if [ "$XZ_THREADS_FORCED" = "yes" ]; then
         packagecompression="xz --threads=${THREADS}"
       else
         # Let xz determine how many threads to use:
@@ -449,7 +449,7 @@ for package in $* ; do
     fi
     ;;
   'txz' )
-    if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then
+    if [ "$XZ_THREADS_FORCED" = "yes" ]; then
       packagecompression="xz --threads=${THREADS}"
     else
       # Let xz determine how many threads to use:
diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg
index 72746fa84..7ddf5dbd4 100644
--- a/source/a/pkgtools/scripts/makepkg
+++ b/source/a/pkgtools/scripts/makepkg
@@ -251,8 +251,7 @@ elif [ ! "$(basename $PACKAGE_NAME .tar.lzma)" = "$PACKAGE_NAME" ]; then
 elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then
   EXTENSION="txz"
   if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then
-    # TODO: Add ARM 64-bit $ARCHes to this test:
-    if [ "$(uname -m)" = "x86_64" ]; then
+    if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then
       # Allow xz to determine how many threads to use:
       COMPRESSOR="xz ${COMPRESS_OPTION} --threads=0 -c"
     else
@@ -269,8 +268,7 @@ elif [ ! "$(basename $PACKAGE_NAME .txz)" = "$PACKAGE_NAME" ]; then
 elif [ ! "$(basename $PACKAGE_NAME .tar.xz)" = "$PACKAGE_NAME" ]; then
   EXTENSION="tar.xz"
   if [ ! "$XZ_THREADS_FORCED" = "yes" ]; then
-    # TODO: Add ARM 64-bit $ARCHes to this test:
-    if [ "$(uname -m)" = "x86_64" ]; then
+    if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then
       # Allow xz to determine how many threads to use:
       COMPRESSOR="xz ${COMPRESS_OPTION} --threads=0 -c"
     else
diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild
index c23d2d2b0..5a3284a79 100755
--- a/source/a/xz/xz.SlackBuild
+++ b/source/a/xz/xz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xz
 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
@@ -89,6 +89,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Change default verbosity from V_WARNING to V_ERROR to prevent spamming
+# the screen with messages concerning steps that xz it taking to reduce
+# memory use (these aren't indicating any sort of failure, so...)
+zcat $CWD/xz.default.verbosity.V_ERROR.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/a/xz/xz.default.verbosity.V_ERROR.diff b/source/a/xz/xz.default.verbosity.V_ERROR.diff
new file mode 100644
index 000000000..c6c3aef45
--- /dev/null
+++ b/source/a/xz/xz.default.verbosity.V_ERROR.diff
@@ -0,0 +1,11 @@
+--- ./src/xz/message.c.orig	2023-01-11 10:51:42.000000000 -0600
++++ ./src/xz/message.c	2023-01-19 13:52:39.484987693 -0600
+@@ -22,7 +22,7 @@
+ static unsigned int files_total;
+ 
+ /// Verbosity level
+-static enum message_verbosity verbosity = V_WARNING;
++static enum message_verbosity verbosity = V_ERROR;
+ 
+ /// Filename which we will print with the verbose messages
+ static const char *filename;