summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-10-15 20:47:13 +0000
committerEric Hameleers <alien@slackware.com>2021-10-16 09:04:20 +0200
commitaadd8167b60785f4ee2cc4368e1faa018900a387 (patch)
treef91b6de5d9fba92a6f44420557f5a08a09123b91 /source
parentbd6ff8d439f656e50de1d6f7d43464bd5dcc3bab (diff)
downloadcurrent-aadd8167b60785f4ee2cc4368e1faa018900a387.tar.gz
Fri Oct 15 20:47:13 UTC 202120211015204713
ap/htop-3.1.1-x86_64-1.txz: Upgraded. d/automake-1.16.2-noarch-4.txz: Rebuilt. The GNU toolchain is making it increasingly impossible to use our usual "${ARCH}-slackware-linux" host, erroring out with a host mismatch on at least GTK+2. So, we'll drop back to this version of automake for now, with a fix applied for detecting Python 3.10. More than likely we'll be changing the host to "${ARCH}-slackware-linux-gnu" to satisfy upstream, but that will have to wait for the next devel cycle. d/llvm-13.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/rust-1.55.0-x86_64-2.txz: Rebuilt. Recompiled against llvm-13.0.0. kde/kdevelop-5.6.2-x86_64-6.txz: Rebuilt. Recompiled against llvm-13.0.0. kde/plasma-workspace-5.23.0-x86_64-2.txz: Rebuilt. Applied upstream patch: [PATCH] sddm-theme: fix missing password field on "Other" page. Thanks to USUARIONUEVO and LuckyCyborg. l/libclc-13.0.0-x86_64-1.txz: Upgraded. Recompiled against llvm-13.0.0. l/python-pillow-8.4.0-x86_64-1.txz: Upgraded. l/qt5-5.15.3_20211013_5c7c3af5-x86_64-1.txz: Upgraded. Upgraded to latest git (might as well) and compiled against llvm-13.0.0. l/spirv-llvm-translator-20210920_098034ea-x86_64-1.txz: Upgraded. Recompiled against llvm-13.0.0. x/mesa-21.2.4-x86_64-1.txz: Upgraded. Compiled against llvm-13.0.0. xap/pidgin-2.14.8-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/d/automake/automake.SlackBuild5
-rw-r--r--source/d/automake/automake.python.3.10.diff22
-rw-r--r--source/d/llvm/clang.toolchains.i586.triple.diff21
-rwxr-xr-xsource/d/llvm/llvm.SlackBuild2
-rw-r--r--source/d/llvm/llvm.url48
-rwxr-xr-xsource/d/rust/rust.SlackBuild2
-rw-r--r--source/kde/kde/build/kdevelop2
-rw-r--r--source/kde/kde/build/plasma-workspace2
-rw-r--r--source/kde/kde/patch/plasma-workspace.patch2
-rw-r--r--source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch49
-rwxr-xr-xsource/l/libclc/libclc.SlackBuild4
-rwxr-xr-xsource/l/python-pillow/python-pillow.SlackBuild2
-rwxr-xr-xsource/l/spirv-llvm-translator/fetch-SPIRV-LLVM-Translator.sh52
-rwxr-xr-xsource/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild6
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild15
15 files changed, 184 insertions, 50 deletions
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index 962d106b..6fbc3b06 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=automake
VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
# Note: the package is _built_ as 'noarch'
# Automatically determine architecture for build & packaging:
@@ -63,6 +63,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Python detection fix for 3.10:
+zcat $CWD/automake.python.3.10.diff.gz | patch -p1 --verbose || exit 1
+
./configure \
--prefix=/usr \
--mandir=/usr/man \
diff --git a/source/d/automake/automake.python.3.10.diff b/source/d/automake/automake.python.3.10.diff
new file mode 100644
index 00000000..02dd7348
--- /dev/null
+++ b/source/d/automake/automake.python.3.10.diff
@@ -0,0 +1,22 @@
+--- ./m4/python.m4.orig 2020-01-01 13:43:28.000000000 -0600
++++ ./m4/python.m4 2021-10-15 11:40:40.523668203 -0500
+@@ -86,12 +86,14 @@
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+ else
+
+- dnl Query Python for its version number. Getting [:3] seems to be
+- dnl the best way to do this; it's what "site.py" does in the standard
+- dnl library.
+-
++ dnl Query Python for its version number. Although site.py simply uses
++ dnl sys.version[:3], printing that failed with Python 3.10, since the
++ dnl trailing zero was eliminated. So now we output just the major
++ dnl and minor version numbers, as numbers. Apparently the tertiary
++ dnl version is not of interest.
++ dnl
+ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
++ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+
+ dnl Use the values of $prefix and $exec_prefix for the corresponding
diff --git a/source/d/llvm/clang.toolchains.i586.triple.diff b/source/d/llvm/clang.toolchains.i586.triple.diff
index cbdc82ac..90e66c55 100644
--- a/source/d/llvm/clang.toolchains.i586.triple.diff
+++ b/source/d/llvm/clang.toolchains.i586.triple.diff
@@ -1,11 +1,10 @@
---- ./tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig 2019-01-15 15:04:36.000000000 -0600
-+++ ./tools/clang/lib/Driver/ToolChains/Gnu.cpp 2019-03-20 13:18:48.828439494 -0500
-@@ -1903,7 +1903,7 @@
- "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
- "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
- "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
-- "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
-+ "i486-slackware-linux", "i586-slackware-linux", "i686-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
- "i686-linux-android", "i386-gnu", "i486-gnu",
- "i586-gnu", "i686-gnu"};
-
+--- ./tools/clang/lib/Driver/ToolChains/Gnu.cpp.orig 2021-09-24 11:18:10.000000000 -0500
++++ ./tools/clang/lib/Driver/ToolChains/Gnu.cpp 2021-10-05 14:17:02.597518687 -0500
+@@ -2114,6 +2114,7 @@
+ "i586-linux-gnu", "i686-linux-gnu",
+ "i686-pc-linux-gnu", "i386-redhat-linux6E",
+ "i686-redhat-linux", "i386-redhat-linux",
++ "i586-slackware-linux", "i686-slackware-linux",
+ "i586-suse-linux", "i686-montavista-linux",
+ "i686-linux-android", "i686-gnu",
+ };
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 3be521a6..f2f1ab09 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=llvm
VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index eeafb096..835dd181 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,25 +1,25 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/llvm-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang-tools-extra-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/compiler-rt-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/flang-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/lldb-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/openmp-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/polly-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/libcxx-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/libcxxabi-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/lld-12.0.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/libunwind-12.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/llvm-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang-tools-extra-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/compiler-rt-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/flang-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/lldb-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/openmp-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/polly-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/libcxx-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/libcxxabi-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/lld-13.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/libunwind-13.0.0.src.tar.xz
-#http://llvm.org/releases/12.0.1/llvm-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/clang-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/clang-tools-extra-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/compiler-rt-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/flang-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/lldb-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/openmp-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/polly-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/libcxx-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/libcxxabi-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/lld-12.0.1.src.tar.xz
-#http://llvm.org/releases/12.0.1/libunwind-12.0.1.src.tar.xz
+#http://llvm.org/releases/13.0.0/llvm-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/clang-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/clang-tools-extra-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/compiler-rt-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/flang-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/lldb-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/openmp-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/polly-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/libcxx-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/libcxxabi-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/lld-13.0.0.src.tar.xz
+#http://llvm.org/releases/13.0.0/libunwind-13.0.0.src.tar.xz
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 0000ae3a..286c7bd1 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
VERSION=${VERSION:-1.55.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
# YES is probably better (when it works...)
diff --git a/source/kde/kde/build/kdevelop b/source/kde/kde/build/kdevelop
index 7ed6ff82..1e8b3149 100644
--- a/source/kde/kde/build/kdevelop
+++ b/source/kde/kde/build/kdevelop
@@ -1 +1 @@
-5
+6
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
new file mode 100644
index 00000000..5bea067f
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -0,0 +1,2 @@
+# [PATCH] sddm-theme: fix missing password field on "Other" page:
+cat $CWD/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch b/source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
new file mode 100644
index 00000000..06d44b91
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
@@ -0,0 +1,49 @@
+From d5a3e749a30613294f41386180aaf31dfb1a9bee Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 14 Oct 2021 15:44:33 -0600
+Subject: [PATCH] sddm-theme: fix missing password field on "Other" page
+
+On this page there is no concept of the user being passwordless because
+no username has been specified by the user yet; we cannot know ahead of
+time. As a result, userList.currentItem.needsPassword is blank so the
+password field gets hidden.
+
+We should just assume that in username/password entry mode, all users
+have a password set. For any users where this is not the case, they can
+just leave the password blank, and it's not any worse than it was in
+Plasma 5.22.
+
+BUG: 443737
+FIXED-IN: 5.23.1
+
+
+(cherry picked from commit f038ab3f494f26b443b10ff5dc9f156e1ec16341)
+---
+ sddm-theme/Login.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
+index 8829666f1..6d3d62804 100644
+--- a/sddm-theme/Login.qml
++++ b/sddm-theme/Login.qml
+@@ -83,7 +83,7 @@ SessionManagementScreen {
+ }
+ }
+
+- visible: userList.currentItem.needsPassword
++ visible: root.showUsernamePrompt || userList.currentItem.needsPassword
+
+ Keys.onEscapePressed: {
+ mainStack.currentItem.forceActiveFocus();
+@@ -119,7 +119,7 @@ SessionManagementScreen {
+
+ icon.name: text.length == 0 ? "go-next" : ""
+
+- text: userList.currentItem.needsPassword ? "" : i18n("Log In")
++ text: root.showUsernamePrompt || userList.currentItem.needsPassword ? "" : i18n("Log In")
+ onClicked: startLogin();
+ }
+ }
+--
+2.33.0
+
diff --git a/source/l/libclc/libclc.SlackBuild b/source/l/libclc/libclc.SlackBuild
index b1931d86..ba739d76 100755
--- a/source/l/libclc/libclc.SlackBuild
+++ b/source/l/libclc/libclc.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libclc
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -75,7 +75,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf libclc-${VERSION}.src
-tar xvf $CWD/libclc-$VERSION.src.tar.?z* || exit 1
+tar xvf $CWD/libclc-$VERSION.src.tar.?z || exit 1
cd libclc-${VERSION}.src || exit 1
chown -R root:root .
find . \
diff --git a/source/l/python-pillow/python-pillow.SlackBuild b/source/l/python-pillow/python-pillow.SlackBuild
index 33031c7f..84127f41 100755
--- a/source/l/python-pillow/python-pillow.SlackBuild
+++ b/source/l/python-pillow/python-pillow.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-pillow
VERSION=${VERSION:-$(echo Pillow-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/spirv-llvm-translator/fetch-SPIRV-LLVM-Translator.sh b/source/l/spirv-llvm-translator/fetch-SPIRV-LLVM-Translator.sh
new file mode 100755
index 00000000..ee5f62e4
--- /dev/null
+++ b/source/l/spirv-llvm-translator/fetch-SPIRV-LLVM-Translator.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Copyright 2021 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.
+
+
+PKGNAM=SPIRV-LLVM-Translator
+
+# Pull a stable branch + patches
+BRANCH=${1:-llvm_release_130}
+
+# Clear download area:
+rm -rf ${PKGNAM}
+
+# Clone repository:
+git clone https://github.com/KhronosGroup/${PKGNAM}
+
+# checkout $BRANCH:
+( cd ${PKGNAM}
+ git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )"
+DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )"
+LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )"
+# Cleanup. We're not packing up the whole git repo.
+( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv ${PKGNAM} ${PKGNAM}-${DATE}_${HEADISAT}
+tar cf ${PKGNAM}-${DATE}_${HEADISAT}.tar ${PKGNAM}-${DATE}_${HEADISAT}
+plzip -9 -f ${PKGNAM}-${DATE}_${HEADISAT}.tar
+rm -rf ${PKGNAM}-${DATE}_${HEADISAT}
+touch -d "$LONGDATE" ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz
+echo
+echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz"
+echo
diff --git a/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild b/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild
index 78ca6cab..aa32098f 100755
--- a/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild
+++ b/source/l/spirv-llvm-translator/spirv-llvm-translator.SlackBuild
@@ -83,6 +83,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# This git pull needs a specific set of headers. These were obtained by letting
+# the build download them, and then tarring them up and pointing to them with
+# the -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR option below.
+tar xf $CWD/SPIRV-Headers.tar.lz
+
# Build and install:
mkdir -p build
cd build
@@ -97,6 +102,7 @@ cd build
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=Release \
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$TMP/SPIRV-LLVM-Translator-$VERSION/SPIRV-Headers \
..
make $NUMJOBS || make || exit 1
make $NUMJOBS llvm-spirv || make llvm-spirv || exit 1
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 3841ca31..47c0bcb9 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -50,13 +50,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-# Build swr for the following architectures (not for i?x6, as this will cause
-# an Illegal Instruction startup failure on many otherwise supported CPUs):
-for swr_arch in x86_64 ; do
- if [ "$ARCH" = "x86_64" ]; then
- GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swr"
- fi
-done
+## COMMENTED OUT as swr seems to be broken with llvm13:
+## Build swr for the following architectures (not for i?x6, as this will cause
+## an Illegal Instruction startup failure on many otherwise supported CPUs):
+#for swr_arch in x86_64 ; do
+# if [ "$ARCH" = "x86_64" ]; then
+# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swr"
+# fi
+#done
TMP=${TMP:-/tmp}
PKG=$TMP/package-mesa