summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-03-06 21:30:27 +0000
committer Eric Hameleers <alien@slackware.com>2024-03-06 23:09:42 +0100
commitc3fb4577bf0ad3f9a7369ba6b4d9be979de8fc9f (patch)
treecd3cc8f5f42b8043a093b78bc7d8d7689d7fb92d /source
parent367bace23da4d361a74c59d265e4f9a22635dbc5 (diff)
downloadcurrent-c3fb4577bf0ad3f9a7369ba6b4d9be979de8fc9f.tar.gz
current-c3fb4577bf0ad3f9a7369ba6b4d9be979de8fc9f.tar.xz
Wed Mar 6 21:30:27 UTC 202420240306213027
a/etc-15.1-x86_64-8.txz: Rebuilt. Added UID 54 and GID 54 for nslcd. Thanks to Thom1b. a/hwdata-0.380-noarch-1.txz: Upgraded. a/kernel-firmware-20240305_d13f88b-noarch-1.txz: Upgraded. a/kernel-generic-6.6.21-x86_64-1.txz: Upgraded. a/kernel-huge-6.6.21-x86_64-1.txz: Upgraded. a/kernel-modules-6.6.21-x86_64-1.txz: Upgraded. d/kernel-headers-6.6.21-x86-1.txz: Upgraded. k/kernel-source-6.6.21-noarch-1.txz: Upgraded. kde/bluedevil-5.27.11-x86_64-1.txz: Upgraded. kde/breeze-5.27.11-x86_64-1.txz: Upgraded. kde/breeze-grub-5.27.11-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.27.11-x86_64-1.txz: Upgraded. kde/drkonqi-5.27.11-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.27.11-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.27.11-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.27.11-x86_64-1.txz: Upgraded. kde/kdecoration-5.27.11-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.27.11-x86_64-1.txz: Upgraded. kde/kgamma5-5.27.11-x86_64-1.txz: Upgraded. kde/khotkeys-5.27.11-x86_64-1.txz: Upgraded. kde/kinfocenter-5.27.11-x86_64-1.txz: Upgraded. kde/kmenuedit-5.27.11-x86_64-1.txz: Upgraded. kde/kpipewire-5.27.11-x86_64-1.txz: Upgraded. kde/kscreen-5.27.11-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.27.11-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.27.11-x86_64-1.txz: Upgraded. kde/ksystemstats-5.27.11-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.27.11-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.27.11-x86_64-1.txz: Upgraded. kde/kwin-5.27.11-x86_64-1.txz: Upgraded. kde/kwrited-5.27.11-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.27.11-x86_64-1.txz: Upgraded. kde/libkscreen-5.27.11-x86_64-1.txz: Upgraded. kde/libksysguard-5.27.11-x86_64-1.txz: Upgraded. kde/milou-5.27.11-x86_64-1.txz: Upgraded. kde/oxygen-5.27.11-x86_64-1.txz: Upgraded. kde/oxygen-sounds-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-disks-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-integration-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-nm-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-pa-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-vault-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.27.11-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.27.11-noarch-1.txz: Upgraded. kde/polkit-kde-agent-1-5.27.11-x86_64-1.txz: Upgraded. kde/powerdevil-5.27.11-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.27.11-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.27.11-x86_64-1.txz: Upgraded. kde/systemsettings-5.27.11-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.27.11-x86_64-1.txz: Upgraded. l/SDL2-2.30.1-x86_64-1.txz: Upgraded. l/libplacebo-6.338.2-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.275.0. l/pango-1.52.1-x86_64-1.txz: Upgraded. n/gnupg-1.4.23-x86_64-6.txz: Rebuilt. Renamed binaries and manpages to end in 1, and renamed internally to gnupg1. Thanks to Lockywolf. n/gnupg2-2.4.4-x86_64-2.txz: Rebuilt. Make a gpg -> gpg2 symlink if it doesn't exist. Thanks to Lockywolf. n/nss-pam-ldapd-0.9.12-x86_64-3.txz: Rebuilt. rc.nss-pam-ldapd: chown /run/nslcd to the new nslcd user/group. Thanks to Thom1b. x/vulkan-sdk-1.3.275.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/etc/etc.SlackBuild2
-rw-r--r--source/a/etc/group.new1
-rw-r--r--source/a/etc/passwd.new1
-rw-r--r--source/a/etc/shadow.new1
-rw-r--r--source/k/kernel-configs/config-generic-6.6.21 (renamed from source/k/kernel-configs/config-generic-6.6.20)2
-rw-r--r--source/k/kernel-configs/config-generic-6.6.21.x64 (renamed from source/k/kernel-configs/config-generic-6.6.20.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-6.6.21 (renamed from source/k/kernel-configs/config-huge-6.6.20)2
-rw-r--r--source/k/kernel-configs/config-huge-6.6.21.x64 (renamed from source/k/kernel-configs/config-huge-6.6.20.x64)2
-rw-r--r--source/kde/kde/build/kpipewire2
-rw-r--r--source/kde/kde/patch/plasma-sdk.patch2
-rw-r--r--source/l/SDL2/SDL2.url2
-rwxr-xr-xsource/l/libplacebo/libplacebo.SlackBuild2
-rw-r--r--source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch27
-rwxr-xr-xsource/n/gnupg/gnupg.SlackBuild41
-rw-r--r--source/n/gnupg2/doinst.sh4
-rwxr-xr-xsource/n/gnupg2/gnupg2.SlackBuild6
-rwxr-xr-xsource/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild2
-rw-r--r--source/n/nss-pam-ldapd/rc.nss-pam-ldapd1
-rw-r--r--source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch15
-rw-r--r--source/x/vulkan-sdk/VERSION2
-rwxr-xr-xsource/x/vulkan-sdk/fetch-sources.sh12
-rw-r--r--source/x/vulkan-sdk/shaderc-2023.8.python3.patch24
-rwxr-xr-xsource/x/vulkan-sdk/vulkan-sdk.SlackBuild77
23 files changed, 168 insertions, 64 deletions
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index a21b99c6d..4a10ba5d9 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=etc
VERSION=15.1
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/etc/group.new b/source/a/etc/group.new
index b44f6f611..71f4923d8 100644
--- a/source/a/etc/group.new
+++ b/source/a/etc/group.new
@@ -35,6 +35,7 @@ icecc:x:49:
ftp:x:50:
oprofile:x:51:
named:x:53:
+nslcd:x:54:
sddm:x:64:
pulse:x:65:
dhcpcd:x:68:
diff --git a/source/a/etc/passwd.new b/source/a/etc/passwd.new
index 1337f161a..5c200b3a3 100644
--- a/source/a/etc/passwd.new
+++ b/source/a/etc/passwd.new
@@ -22,6 +22,7 @@ icecc:x:49:49:User for Icecream distributed compiler:/var/cache/icecream:/bin/fa
oprofile:x:51:51:oprofile:/:/bin/false
usbmux:x:52:83:User for usbmux daemon:/var/empty:/bin/false
named:x:53:53:User for BIND:/var/named:/bin/false
+nslcd:x:54:54:User for nslcd (nss-pam-ldapd):/dev/null:/bin/false
sddm:x:64:64:User for SDDM:/var/lib/sddm:/bin/false
pulse:x:65:65:User for PulseAudio:/var/run/pulse:/bin/false
dhcpcd:x:68:68:User for dhcpcd:/var/lib/dhcpcd:/bin/false
diff --git a/source/a/etc/shadow.new b/source/a/etc/shadow.new
index add579ad6..e2bad0ff1 100644
--- a/source/a/etc/shadow.new
+++ b/source/a/etc/shadow.new
@@ -22,6 +22,7 @@ icecc:*:9797:0:::::
oprofile:*:9797:0:::::
usbmux:*:9797:0:::::
named:*:9797:0:::::
+nslcd:*:9797:0:::::
sddm:*:9797:0:::::
pulse:*:9797:0:::::
dhcpcd:*:9797:0:::::
diff --git a/source/k/kernel-configs/config-generic-6.6.20 b/source/k/kernel-configs/config-generic-6.6.21
index f01f61618..b4fe2ca04 100644
--- a/source/k/kernel-configs/config-generic-6.6.20
+++ b/source/k/kernel-configs/config-generic-6.6.21
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.20 Kernel Configuration
+# Linux/x86 6.6.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-6.6.20.x64 b/source/k/kernel-configs/config-generic-6.6.21.x64
index 1d21c2920..d1e5beeef 100644
--- a/source/k/kernel-configs/config-generic-6.6.20.x64
+++ b/source/k/kernel-configs/config-generic-6.6.21.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.20 Kernel Configuration
+# Linux/x86 6.6.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.6.20 b/source/k/kernel-configs/config-huge-6.6.21
index 5733097ae..a0d663ef7 100644
--- a/source/k/kernel-configs/config-huge-6.6.20
+++ b/source/k/kernel-configs/config-huge-6.6.21
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.20 Kernel Configuration
+# Linux/x86 6.6.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.6.20.x64 b/source/k/kernel-configs/config-huge-6.6.21.x64
index d500ecc3d..1cdd36841 100644
--- a/source/k/kernel-configs/config-huge-6.6.20.x64
+++ b/source/k/kernel-configs/config-huge-6.6.21.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.20 Kernel Configuration
+# Linux/x86 6.6.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/kde/kde/build/kpipewire b/source/kde/kde/build/kpipewire
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kpipewire
+++ b/source/kde/kde/build/kpipewire
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/plasma-sdk.patch b/source/kde/kde/patch/plasma-sdk.patch
new file mode 100644
index 000000000..c232fca2c
--- /dev/null
+++ b/source/kde/kde/patch/plasma-sdk.patch
@@ -0,0 +1,2 @@
+# Remove mistakenly packaged directory to fix build:
+rm -rf po/sv/docs/plasma-sdk
diff --git a/source/l/SDL2/SDL2.url b/source/l/SDL2/SDL2.url
index 7185a61c7..6f063ccde 100644
--- a/source/l/SDL2/SDL2.url
+++ b/source/l/SDL2/SDL2.url
@@ -1,2 +1,2 @@
https://github.com/libsdl-org/SDL
-https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-2.30.0.tar.gz
+https://github.com/libsdl-org/SDL/releases/download/release-2.30.1/SDL2-2.30.1.tar.gz
diff --git a/source/l/libplacebo/libplacebo.SlackBuild b/source/l/libplacebo/libplacebo.SlackBuild
index 608324215..50b411da6 100755
--- a/source/l/libplacebo/libplacebo.SlackBuild
+++ b/source/l/libplacebo/libplacebo.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libplacebo
VERSION=${VERSION:-$(echo libplacebo-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch b/source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch
new file mode 100644
index 000000000..6dc91811c
--- /dev/null
+++ b/source/n/gnupg/0001-Rename-package-to-gnupg1-1656282.patch
@@ -0,0 +1,27 @@
+From 684cf85eeac78fd716f476a6b9678cc11336f8b6 Mon Sep 17 00:00:00 2001
+From: "Brian C. Lane" <bcl@redhat.com>
+Date: Wed, 5 Dec 2018 08:52:51 -0800
+Subject: [PATCH] Rename package to gnupg1 (#1656282)
+
+gnupg2 is going to start using /usr/bin/gpg so we need to rename the
+gnupg v1.4.x version to avoid conflicts.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e5bf1bc1a..085ebd33e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,7 @@ m4_define([mym4_betastring],
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+-AC_INIT([gnupg],[mym4_full_version], [https://bugs.gnupg.org])
++AC_INIT([gnupg1],[mym4_full_version], [https://bugs.gnupg.org])
+
+
+ development_version=mym4_isgit
+--
+2.19.2
+
diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild
index 572ffc120..965da043e 100755
--- a/source/n/gnupg/gnupg.SlackBuild
+++ b/source/n/gnupg/gnupg.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2016, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2016, 2018, 2021, 2024 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=gnupg
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -74,6 +74,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+cat $CWD/0001-Rename-package-to-gnupg1-1656282.patch | patch -p1 --verbose || exit 1
+autoreconf -vif
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -84,13 +87,33 @@ CFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*
-
-gzip -9 $PKG/usr/man/*/*
+# Rename the binaries:
+for binary in gpg gpgv gpg-zip gpgsplit; do
+ mv $PKG/usr/bin/${binary} $PKG/usr/bin/${binary}1
+done
+
+# Rename the manpages:
+for page in gpg gpgv gpg-zip ; do
+ mv $PKG/usr/man/man1/${page}.1 $PKG/usr/man/man1/${page}1.1
+done
+
+# 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
+
+# Compress info files, if any:
+if [ -d $PKG/usr/info ]; then
+ ( cd $PKG/usr/info
+ rm -f dir
+ gzip -9 *
+ )
+fi
mkdir -p $PKG/usr/doc/gnupg-$VERSION
cp -a \
diff --git a/source/n/gnupg2/doinst.sh b/source/n/gnupg2/doinst.sh
new file mode 100644
index 000000000..a9920d0ca
--- /dev/null
+++ b/source/n/gnupg2/doinst.sh
@@ -0,0 +1,4 @@
+# If there's no /usr/bin/gpg, claim it:
+if [ ! -e usr/bin/gpg ]; then
+ ln -sf gpg2 usr/bin/gpg
+fi
diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild
index eb30b9d3d..03b713e07 100755
--- a/source/n/gnupg2/gnupg2.SlackBuild
+++ b/source/n/gnupg2/gnupg2.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2006-2010 Robby Workman, Northport, AL, USA
-# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gnupg2
VERSION=${VERSION:-$(echo gnupg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -134,8 +134,8 @@ if [ -r ChangeLog ]; then
fi
mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
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/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild b/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
index a9343954c..cee7f9596 100755
--- a/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
+++ b/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=nss-pam-ldapd
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/nss-pam-ldapd/rc.nss-pam-ldapd b/source/n/nss-pam-ldapd/rc.nss-pam-ldapd
index 7a4252a38..d1c9d7ede 100644
--- a/source/n/nss-pam-ldapd/rc.nss-pam-ldapd
+++ b/source/n/nss-pam-ldapd/rc.nss-pam-ldapd
@@ -10,6 +10,7 @@ nslcd_start() {
if [ -x /usr/sbin/nslcd -a -r /etc/nslcd.conf ]; then
# Ensure /run directory exists:
mkdir -p /run/nslcd
+ chown -R nslcd:nslcd /run/nslcd
echo "Starting local LDAP name service daemon: /usr/sbin/nslcd"
/usr/sbin/nslcd
fi
diff --git a/source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch b/source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch
new file mode 100644
index 000000000..bc86805d6
--- /dev/null
+++ b/source/x/vulkan-sdk/DirectXShaderCompiler.noverify.patch
@@ -0,0 +1,15 @@
+--- ./cmake/modules/HCT.cmake.orig 2024-02-03 14:07:18.000000000 -0600
++++ ./cmake/modules/HCT.cmake 2024-02-03 14:29:21.535797775 -0600
+@@ -92,9 +92,9 @@
+ # file, and define the verification command
+ if(NOT copy_sources)
+ set(output ${temp_output})
+- if (CLANG_FORMAT_EXE) # Only verify sources if clang-format is available.
+- set(verification COMMAND ${CMAKE_COMMAND} -E compare_files ${temp_output} ${full_output})
+- endif()
++ #if (CLANG_FORMAT_EXE) # Only verify sources if clang-format is available.
++ # set(verification COMMAND ${CMAKE_COMMAND} -E compare_files ${temp_output} ${full_output})
++ #endif()
+ endif()
+ if(WIN32 AND NOT HLSL_AUTOCRLF)
+ set(force_lf "--force-lf")
diff --git a/source/x/vulkan-sdk/VERSION b/source/x/vulkan-sdk/VERSION
index 1915db620..2cd3c443b 100644
--- a/source/x/vulkan-sdk/VERSION
+++ b/source/x/vulkan-sdk/VERSION
@@ -1 +1 @@
-1.3.268.0
+1.3.275.0
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh
index 5b791dbaf..4202b1d4a 100755
--- a/source/x/vulkan-sdk/fetch-sources.sh
+++ b/source/x/vulkan-sdk/fetch-sources.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2017, 2018, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2017, 2018, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA
# Copyright 2021 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
@@ -163,9 +163,9 @@ rm -f *.fetched
# is produced.) So, if we find an unreasonably small shaderc, just pull a
# recent one.
if [ "$(tar tf shaderc-*.tar.lz | wc -l)" -lt "7" ]; then
- rm shaderc-*.tar.lz
- lftpget https://github.com/google/shaderc/archive/refs/tags/v2023.7.tar.gz
- mv v2023.7.tar.gz shaderc-2023.7.tar.gz
- gzip -d shaderc-2023.7.tar.gz
- plzip -9 shaderc-2023.7.tar
+ rm shaderc-*.tar.*
+ lftpget https://github.com/google/shaderc/archive/refs/tags/v2023.8.tar.gz
+ mv v2023.8.tar.gz shaderc-2023.8.tar.gz
+ gzip -d shaderc-2023.8.tar.gz
+ plzip -9 shaderc-2023.8.tar
fi
diff --git a/source/x/vulkan-sdk/shaderc-2023.8.python3.patch b/source/x/vulkan-sdk/shaderc-2023.8.python3.patch
new file mode 100644
index 000000000..263788ef0
--- /dev/null
+++ b/source/x/vulkan-sdk/shaderc-2023.8.python3.patch
@@ -0,0 +1,24 @@
+--- ./utils/update_build_version.py.orig 2024-01-03 11:45:00.000000000 -0600
++++ ./utils/update_build_version.py 2024-02-03 13:48:45.412743279 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+
+ # Copyright 2016 The Shaderc Authors. All rights reserved.
+ #
+--- ./utils/add_copyright.py.orig 2024-01-03 11:45:00.000000000 -0600
++++ ./utils/add_copyright.py 2024-02-03 13:48:14.417742586 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # Copyright 2015 The Shaderc Authors. All rights reserved.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+--- ./utils/remove-file-by-suffix.py.orig 2024-01-03 11:45:00.000000000 -0600
++++ ./utils/remove-file-by-suffix.py 2024-02-03 13:48:31.279742963 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+
+ # Copyright 2015 The Shaderc Authors. All rights reserved.
+ #
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 0aae80ebb..4da00c705 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for vulkan-sdk
-# Copyright 2016, 2017, 2018, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2017, 2018, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,6 +29,10 @@ PKGNAM=vulkan-sdk
VERSION=${VERSION:-$(cat VERSION)}
BUILD=${BUILD:-1}
+# Choose a compiler (gcc/g++ or clang/clang++ if you'd like to debug that ;-)
+export CC=${CC:-gcc}
+export CXX=${CXX:-g++}
+
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
@@ -356,6 +360,32 @@ cd build
make install DESTDIR=$PKG || exit 1
cd $TMP
+tar xvf $CWD/volk-vulkan-sdk-$VOLK_VERSION.tar.?z || exit 1
+cd $TMP/volk-vulkan-sdk-$VOLK_VERSION
+
+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 {} \+
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \
+ -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
+ -DVOLK_INSTALL=ON \
+ ..
+
+ make $NUMJOBS || make || exit 1
+ make install DESTDIR=$PKG || exit 1
+
+cd $TMP
tar xvf $CWD/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1
cd $TMP/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION
@@ -479,6 +509,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Use python3:
+cat $CWD/shaderc-2023.8.python3.patch | patch -p1 --verbose || exit 1
+
# Report correct versions in `glslc --version`
# git describe output collected in fetch-sources.sh
sed -i "s|\['git', 'describe'\]|\['cat', '.git-version'\]|" \
@@ -571,13 +604,8 @@ cd $TMP
tar xvf $CWD/DirectXShaderCompiler-$DXC_VERSION.tar.?z || exit 1
cd $TMP/DirectXShaderCompiler-$DXC_VERSION
-# Fix warning/error on gcc13 about changed meaning
-# Thanks to gentoo: https://bugs.gentoo.org/905173
-zcat $CWD/DirectXShaderCompiler-gcc13.patch.gz | patch -p1 --verbose || exit 1
-
-# Don't link unit test library in dxa.
-# Upstream commit daf1386161cd6912fbd358f13d74e81466edab8b
-zcat $CWD/DirectXShaderCompiler-dump-reflection.patch.gz | patch -p1 --verbose || exit 1
+# This breaks the build, so skip it:
+cat $CWD/DirectXShaderCompiler.noverify.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
@@ -600,7 +628,7 @@ cd build
-DHLSL_INCLUDE_TESTS="OFF" \
..
- make $NUMJOBS || make || exit 1
+ make $NUMJOBS VERBOSE=1 || make VERBOSE=1 || exit 1
# "make install" is essentially useless at this point
# It installs a bunch of unnecessary llvm files
@@ -649,7 +677,10 @@ tar xvf $CWD/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit
cd $TMP/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION
# do not depend on python-jsonschema
-sed -i "/jsonschema/d" scripts/gen_profiles_solution.py
+#sed -i "/jsonschema/d" scripts/gen_profiles_solution.py
+
+# Fix indentation error:
+#cat $CWD/Vulkan-Profiles-vulkan-sdk.indent.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
@@ -681,32 +712,6 @@ cd build
make install DESTDIR=$PKG || exit 1
cd $TMP
-tar xvf $CWD/volk-vulkan-sdk-$VOLK_VERSION.tar.?z || exit 1
-cd $TMP/volk-vulkan-sdk-$VOLK_VERSION
-
-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 {} \+
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \
- -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
- -DVOLK_INSTALL=ON \
- ..
-
- make $NUMJOBS || make || exit 1
- make install DESTDIR=$PKG || exit 1
-
-cd $TMP
tar xvf $CWD/VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION.tar.?z || exit 1
cd $TMP/VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION