Fri Nov 24 20:52:02 UTC 202320231124205202

a/openssl-solibs-3.2.0-x86_64-1.txz:  Upgraded.
ap/sqlite-3.44.2-x86_64-1.txz:  Upgraded.
ap/vim-9.0.2127-x86_64-1.txz:  Upgraded.
  Fixed security issues.
  Thanks to marav for the heads-up.
  For more information, see:
    https://www.cve.org/CVERecord?id=CVE-2023-48231
    https://www.cve.org/CVERecord?id=CVE-2023-48232
    https://www.cve.org/CVERecord?id=CVE-2023-48233
    https://www.cve.org/CVERecord?id=CVE-2023-48234
    https://www.cve.org/CVERecord?id=CVE-2023-48235
    https://www.cve.org/CVERecord?id=CVE-2023-48236
    https://www.cve.org/CVERecord?id=CVE-2023-48237
  (* Security fix *)
d/parallel-20231122-noarch-1.txz:  Upgraded.
l/cfitsio-4.3.1-x86_64-1.txz:  Upgraded.
l/ffmpeg-5.1.4-x86_64-2.txz:  Rebuilt.
  Recompiled against vulkan-sdk-1.3.268.0.
n/openssl-3.2.0-x86_64-1.txz:  Upgraded.
  OpenSSL 3.2.0 is a feature release adding significant new functionality.
  This release incorporates the following potentially significant or
  incompatible changes:
  * The default SSL/TLS security level has been changed from 1 to 2.
  * The `x509`, `ca`, and `req` apps now always produce X.509v3 certificates.
  * Subject or issuer names in X.509 objects are now displayed as UTF-8 strings
    by default.
x/vulkan-sdk-1.3.268.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
xap/vim-gvim-9.0.2127-x86_64-1.txz:  Upgraded.

1 files changed, 178 insertions, 179 deletions

diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 140a77f61..0aae80ebb 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -71,36 +71,39 @@ fi
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-vulkan-sdk
 
-GLSLANG_VERSION=$(echo glslang-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+GLSLANG_VERSION=$(echo glslang-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 SPIRV_HEADERS_VERSION=$(echo SPIRV-Headers-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_HEADERS_VERSION=$(echo Vulkan-Headers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_LOADER_VERSION=$(echo Vulkan-Loader-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_VALIDATIONLAYERS_VERSION=$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_HEADERS_VERSION=$(echo Vulkan-Headers-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_LOADER_VERSION=$(echo Vulkan-Loader-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_VALIDATIONLAYERS_VERSION=$(echo Vulkan-ValidationLayers-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 ROBIN_HOOD_VERSION=$(echo robin-hood-hashing-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_TOOLS_VERSION=$(echo Vulkan-Tools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKANTOOLS_VERSION=$(echo VulkanTools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_TOOLS_VERSION=$(echo Vulkan-Tools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKANTOOLS_VERSION=$(echo VulkanTools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 SHADERC_VERSION=$(echo shaderc-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-GFXRECONSTRUCT_VERSION=$(echo gfxreconstruct-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+GFXRECONSTRUCT_VERSION=$(echo gfxreconstruct-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 DXC_VERSION=$(echo DirectXShaderCompiler-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_PROFILES_VERSION=$(echo Vulkan-Profiles-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VOLK_VERSION=$(echo volk-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-VULKAN_UTILITY_LIBRARIES_VERSION=$(echo Vulkan-Utility-Libraries-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_PROFILES_VERSION=$(echo Vulkan-Profiles-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VOLK_VERSION=$(echo volk-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+VULKAN_UTILITY_LIBRARIES_VERSION=$(echo Vulkan-Utility-Libraries-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 VULKAN_CAPS_VIEWER_VERSION=$(echo VulkanCapsViewer-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 VULKAN_MEMORY_ALLOCATOR_VERSION=$(echo VulkanMemoryAllocator-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 VALIJSON_VERSION=$(echo valijson-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 JSONCPP_VERSION=$(echo jsoncpp-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 
 # upstream builder order:
+# NOTE from volkerdi: any magic build order given in the comments is always, by definition, wrong
 # - SPIRV-Headers
 # - glslang
 # - Vulkan-Headers
 # - Vulkan-Loader
+# - Vulkan-Utility-Libraries
 # - Vulkan-ValidationLayers
 # - Vulkan-ExtensionLayer
+# = valijson
 # - Vulkan-Tools
 # - VulkanTools
 # - shaderc
@@ -116,20 +119,20 @@ mkdir -p $TMP $PKG
 cd $TMP
 # Clear existing tmp sources:
 rm -rf SPIRV-Headers-$SPIRV_HEADERS_VERSION \
-  glslang-sdk-${GLSLANG_VERSION} \
-  Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION \
-  Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION \
-  Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \
-  Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION \
-  Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION \
-  VulkanTools-sdk-$VULKANTOOLS_VERSION \
+  glslang-vulkan-sdk-${GLSLANG_VERSION} \
+  Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION \
+  Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION \
+  Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \
+  Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION \
+  Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION \
+  VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION \
   shaderc-$SHADERC_VERSION \
-  SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION \
-  gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION \
+  SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION \
+  gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION \
   DirectXShaderCompiler-$DXC_VERSION \
-  SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION \
-  Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION \
-  volk-sdk-$VOLK_VERSION \
+  SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION \
+  Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION \
+  volk-vulkan-sdk-$VOLK_VERSION \
   Vulkan-Utility-Libraries-$VULKAN_UTILITY_LIBRARIES_VERSION \
   VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION \
   VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION \
@@ -159,15 +162,15 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/glslang-sdk-${GLSLANG_VERSION}.tar.?z || exit 1
-cd glslang-sdk-$GLSLANG_VERSION/External
-tar xvf $CWD/SPIRV-Tools-sdk-$SPIRV_TOOLS_VERSION.tar.?z || exit 1
-mv SPIRV-Tools-sdk-$SPIRV_TOOLS_VERSION spirv-tools
+tar xvf $CWD/glslang-vulkan-sdk-${GLSLANG_VERSION}.tar.?z || exit 1
+cd glslang-vulkan-sdk-$GLSLANG_VERSION/External
+tar xvf $CWD/SPIRV-Tools-vulkan-sdk-$SPIRV_TOOLS_VERSION.tar.?z || exit 1
+mv SPIRV-Tools-vulkan-sdk-$SPIRV_TOOLS_VERSION spirv-tools
 cd spirv-tools/external
 tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.?z || exit 1
 mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers
 
-cd $TMP/glslang-sdk-${GLSLANG_VERSION}
+cd $TMP/glslang-vulkan-sdk-${GLSLANG_VERSION}
 
 chown -R root:root .
 find . \
@@ -191,8 +194,8 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION.tar.?z || exit 1
-cd Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION
+tar xvf $CWD/Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION.tar.?z || exit 1
+cd Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION
 
 chown -R root:root .
 find . \
@@ -214,8 +217,8 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION.tar.?z || exit 1
-cd $TMP/Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION
+tar xvf $CWD/Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION.tar.?z || exit 1
+cd $TMP/Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION
 
 chown -R root:root .
 find . \
@@ -261,8 +264,33 @@ cd build
   make install DESTDIR=$TMP/robin-hood-hashing-$ROBIN_HOOD_VERSION/build/install || exit 1
 
 cd $TMP
-tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1
-cd Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION
+tar xvf $CWD/Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION.tar.?z || exit 1
+cd $TMP/Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_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 \
+    -DVulkanHeaders_DIR=$PKG/usr/share/cmake/VulkanHeaders/ \
+    ..
+
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+
+cd $TMP
+tar xvf $CWD/Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1
+cd Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION
 
 chown -R root:root .
 find . \
@@ -296,8 +324,8 @@ cd build
   make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION.tar.?z || exit 1
-cd $TMP/Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION
+tar xvf $CWD/Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION.tar.?z || exit 1
+cd $TMP/Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION
 
 chown -R root:root .
 find . \
@@ -328,8 +356,8 @@ cd build
   make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1
-cd $TMP/Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION
+tar xvf $CWD/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1
+cd $TMP/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION
 
 chown -R root:root .
 find . \
@@ -359,8 +387,8 @@ cd build
   make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/VulkanTools-sdk-$VULKANTOOLS_VERSION.tar.?z || exit 1
-cd $TMP/VulkanTools-sdk-$VULKANTOOLS_VERSION
+tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.?z || exit 1
+cd jsoncpp-$JSONCPP_VERSION
 
 chown -R root:root .
 find . \
@@ -369,10 +397,54 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# building jsoncpp
-cd submodules/jsoncpp
-  python3 amalgamate.py
-cd ../../
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_OBJECT_LIBS=OFF \
+    -DBUILD_STATIC_LIBS=ON \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DJSONCPP_WITH_TESTS=OFF \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$TMP/jsoncpp-$JSONCPP_VERSION/build/install || exit 1
+
+cd $TMP
+tar xvf $CWD/valijson-$VALIJSON_VERSION.tar.?z || exit 1
+cd valijson-$VALIJSON_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_INSTALL_PREFIX=/usr \
+    ..
+
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$TMP/valijson-$VALIJSON_VERSION/build/install || exit 1
+
+cd $TMP
+tar xvf $CWD/VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION.tar.?z || exit 1
+cd $TMP/VulkanTools-vulkan-sdk-$VULKANTOOLS_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
@@ -386,6 +458,8 @@ cd build
     -DVULKAN_REGISTRY_PATH_HINT=$PKG/usr \
     -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
     -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr \
+    -Dvalijson_DIR="$TMP/valijson-$VALIJSON_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/valijson" \
+    -Djsoncpp_DIR="$TMP/jsoncpp-$JSONCPP_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/jsoncpp" \
     -DBUILD_WSI_WAYLAND_SUPPORT=On \
     -DBUILD_TESTS=Off \
     -DINSTALL_GTEST=Off \
@@ -427,8 +501,8 @@ cd build
     -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \
     -DSHADERC_SKIP_TESTS=On \
     -DSHADERC_SKIP_EXAMPLES=On \
-    -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-sdk-$GLSLANG_VERSION/External/spirv-tools \
-    -DSHADERC_GLSLANG_DIR=$TMP/glslang-sdk-$GLSLANG_VERSION \
+    -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools \
+    -DSHADERC_GLSLANG_DIR=$TMP/glslang-vulkan-sdk-$GLSLANG_VERSION \
     -DSKIP_GLSLANG_INSTALL=On \
     -DSKIP_SPIRV_TOOLS_INSTALL=On \
     -DBUILD_SHARED_LIBS=On \
@@ -436,13 +510,12 @@ cd build
     -DBUILD_TESTING=Off \
     ..
 
-
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION.tar.?z || exit 1
-cd $TMP/SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION
+tar xvf $CWD/SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION.tar.?z || exit 1
+cd $TMP/SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION
 
 chown -R root:root .
 find . \
@@ -472,8 +545,8 @@ cd build
   make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1
-cd $TMP/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION
+tar xvf $CWD/gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1
+cd $TMP/gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION
 
 chown -R root:root .
 find . \
@@ -543,8 +616,8 @@ cd build
   find $PKG/usr/include/dxc -name "CMakeLists.txt" | xargs rm -f
 
 cd $TMP
-tar xvf $CWD/SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION.tar.?z || exit 1
-cd $TMP/SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION
+tar xvf $CWD/SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION.tar.?z || exit 1
+cd $TMP/SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION
 
 chown -R root:root .
 find . \
@@ -572,82 +645,8 @@ cd build
     $PKG/usr/include/SPIRV-Reflect/include/spirv/unified1/
 
 cd $TMP
-tar xvf $CWD/Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION.tar.?z || exit 1
-cd $TMP/Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_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 \
-    -DVulkanHeaders_DIR=$PKG/usr/share/cmake/VulkanHeaders/ \
-    ..
-
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-
-cd $TMP
-tar xvf $CWD/valijson-$VALIJSON_VERSION.tar.?z || exit 1
-cd valijson-$VALIJSON_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_INSTALL_PREFIX=/usr \
-    ..
-
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$TMP/valijson-$VALIJSON_VERSION/build/install || exit 1
-
-cd $TMP
-tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.?z || exit 1
-cd jsoncpp-$JSONCPP_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_INSTALL_PREFIX=/usr \
-    -DBUILD_OBJECT_LIBS=OFF \
-    -DBUILD_STATIC_LIBS=ON \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DJSONCPP_WITH_TESTS=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    ..
-
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$TMP/jsoncpp-$JSONCPP_VERSION/build/install || exit 1
-
-cd $TMP
-tar xvf $CWD/Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit 1
-cd $TMP/Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION
+tar xvf $CWD/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit 1
+cd $TMP/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION
 
 # do not depend on python-jsonschema
 sed -i "/jsonschema/d" scripts/gen_profiles_solution.py
@@ -669,8 +668,8 @@ cd build
     -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \
     -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
     -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
-    -DVULKAN_HEADERS_SOURCE_DIR="$TMP/Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION" \
-    -DVULKAN_VALIDATIONLAYERS_SOURCE_DIR="$TMP/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION" \
+    -DVULKAN_HEADERS_SOURCE_DIR="$TMP/Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION" \
+    -DVULKAN_VALIDATIONLAYERS_SOURCE_DIR="$TMP/Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION" \
     -DVVL_INCLUDE_DIR="$PKG/usr/include/vulkan" \
     -Dvalijson_DIR="$TMP/valijson-$VALIJSON_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/valijson" \
     -Djsoncpp_DIR="$TMP/jsoncpp-$JSONCPP_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/jsoncpp" \
@@ -682,8 +681,8 @@ cd build
   make install DESTDIR=$PKG || exit 1
 
 cd $TMP
-tar xvf $CWD/volk-sdk-$VOLK_VERSION.tar.?z || exit 1
-cd $TMP/volk-sdk-$VOLK_VERSION
+tar xvf $CWD/volk-vulkan-sdk-$VOLK_VERSION.tar.?z || exit 1
+cd $TMP/volk-vulkan-sdk-$VOLK_VERSION
 
 chown -R root:root .
 find . \
@@ -798,45 +797,45 @@ cp -a \
   SPIRV-Headers-$SPIRV_HEADERS_VERSION/README* \
   $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Headers
 cp -a \
-  glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \
-  glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/README* \
-  glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/*.md \
+  glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \
+  glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/README* \
+  glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Tools
 cp -a \
-  glslang-sdk-$GLSLANG_VERSION/LICENSE* \
-  glslang-sdk-$GLSLANG_VERSION/README* \
-  glslang-sdk-$GLSLANG_VERSION/*.md \
+  glslang-vulkan-sdk-$GLSLANG_VERSION/LICENSE* \
+  glslang-vulkan-sdk-$GLSLANG_VERSION/README* \
+  glslang-vulkan-sdk-$GLSLANG_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/glslang
 cp -a \
-  Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \
-  Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/README* \
-  Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/*.md \
+  Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \
+  Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/README* \
+  Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Headers
 cp -a \
-  Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/LICENSE* \
-  Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/README* \
-  Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/*.md \
-  Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/loader/LoaderAndLayerInterface.md \
+  Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/LICENSE* \
+  Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/README* \
+  Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/*.md \
+  Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/loader/LoaderAndLayerInterface.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Loader
 cp -a \
-  Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/LICENSE* \
-  Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/README* \
-  Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/*.md \
+  Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/LICENSE* \
+  Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/README* \
+  Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-ValidationLayers
 cp -a \
-  Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/LICENSE* \
-  Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/README* \
-  Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/*.md \
+  Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/LICENSE* \
+  Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/README* \
+  Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-ExtensionLayer
 cp -a \
-  Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/LICENSE* \
-  Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/README* \
-  Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/*.md \
+  Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/LICENSE* \
+  Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/README* \
+  Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Tools
 cp -a \
-  VulkanTools-sdk-$VULKANTOOLS_VERSION/LICENSE* \
-  VulkanTools-sdk-$VULKANTOOLS_VERSION/README* \
-  VulkanTools-sdk-$VULKANTOOLS_VERSION/*.md \
+  VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/LICENSE* \
+  VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/README* \
+  VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/VulkanTools
 cp -a \
   shaderc-$SHADERC_VERSION/AUTHORS \
@@ -845,14 +844,14 @@ cp -a \
   shaderc-$SHADERC_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/shaderc
 cp -a \
-  SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/LICENSE* \
-  SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/README* \
-  SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/*.md \
+  SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/LICENSE* \
+  SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/README* \
+  SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Cross
 cp -a \
-  gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \
-  gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/README* \
-  gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/*.md \
+  gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \
+  gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/README* \
+  gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/gfxreconstruct
 cp -a \
   DirectXShaderCompiler-$DXC_VERSION/LICENSE* \
@@ -861,24 +860,24 @@ cp -a \
   DirectXShaderCompiler-$DXC_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/DirectXShaderCompiler
 cp -a \
-  SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/LICENSE* \
-  SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/README* \
-  SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/*.md \
+  SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/LICENSE* \
+  SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/README* \
+  SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Reflect
 cp -a \
-  Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION/LICENSE* \
-  Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION/README* \
-  Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION/*.md \
+  Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/LICENSE* \
+  Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/README* \
+  Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Profiles
 cp -a \
-  volk-sdk-$VOLK_VERSION/LICENSE* \
-  volk-sdk-$VOLK_VERSION/README* \
-  volk-sdk-$VOLK_VERSION/*.md \
+  volk-vulkan-sdk-$VOLK_VERSION/LICENSE* \
+  volk-vulkan-sdk-$VOLK_VERSION/README* \
+  volk-vulkan-sdk-$VOLK_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/volk
 cp -a \
-  Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/LICENSE* \
-  Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/README* \
-  Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/*.md \
+  Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/LICENSE* \
+  Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/README* \
+  Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/*.md \
   $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Utility-Libraries
 cp -a \
   VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION/LICENSE* \