graphics/vulkan-sdk: Updated for version 1.1.114.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 36 insertions, 23 deletions

diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
index c30f7d7bfc..4983b8e845 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=vulkan-sdk
-VERSION=${VERSION:-1.1.108.0}
+VERSION=${VERSION:-1.1.114.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,9 +73,12 @@ cmake_build () {
   make install DESTDIR=$PKG
 }
 
-GLSLANG_VERSION=${GLSLANG_VERSION:-7.11.3214}
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-1.4.1}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-2019.3}
+# Vulkan-ValidationLayers requires git versions
+# listed in the known_good.json file to build.
+# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1082
+GLSLANG_VERSION=${GLSLANG_VERSION:-3cea2e5882e3455731a8b6657fb06db913eb3aa1}
+SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-45c2cc37276d69e5b257507d97fd90d2a5684ccc}
+SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-aa9e8f538041db3055ea443080e0ccc315fa114f}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -102,9 +105,9 @@ tar xvf $CWD/Vulkan-Tools-sdk-$VERSION.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 chdir glslang-$GLSLANG_VERSION
 
@@ -119,15 +122,22 @@ cmake_build
 
 chdir Vulkan-Loader-sdk-$VERSION
 
+# Require an older cmake version.
+sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+
 cmake_build \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_SKIP_RPATH=TRUE \
+  -DBUILD_TESTS=OFF \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
   -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
 
 chdir Vulkan-ValidationLayers-sdk-$VERSION
 
+# Require an older cmake version.
+sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+
 # Disable hardcoded errors
 sed -i '/-Werror/d' CMakeLists.txt
 
@@ -149,14 +159,17 @@ cmake_build \
 
 chdir Vulkan-Tools-sdk-$VERSION
 
+# Require an older cmake version.
+sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
+
 cmake_build \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_SKIP_RPATH=TRUE \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
   -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
-  -DGLSLANG_INSTALL_DIR=$PKG/usr \
-  -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr
+  -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
+  -DGLSLANG_INSTALL_DIR=$PKG/usr
 
 cd -- "$SRC"
 
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
index b0cf186a4e..fdb98db77a 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ b/graphics/vulkan-sdk/vulkan-sdk.info
@@ -1,20 +1,20 @@
 PRGNAM="vulkan-sdk"
-VERSION="1.1.108.0"
+VERSION="1.1.114.0"
 HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/1.4.1/SPIRV-Headers-1.4.1.tar.gz \
-          https://github.com/KhronosGroup/SPIRV-Tools/archive/v2019.3/SPIRV-Tools-2019.3.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.108.0/Vulkan-Headers-sdk-1.1.108.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.1.108.0/Vulkan-Loader-sdk-1.1.108.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.1.108.0/Vulkan-Tools-sdk-1.1.108.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.1.108.0/Vulkan-ValidationLayers-sdk-1.1.108.0.tar.gz \
-          https://github.com/KhronosGroup/glslang/archive/7.11.3214/glslang-7.11.3214.tar.gz"
-MD5SUM="136a6f1acb8b2dc33ec8eb4d29ef889d \
-        453199cc5d9a280231029719188aac41 \
-        4fcc9e1e2fbb5e7c39ee49f3a2e4f4b6 \
-        65338497997e52c19412bae9b12b4855 \
-        dc98c6c425ca06a32e4bb8f2755c5ca5 \
-        577eb509ab8d10c4f522ad28e81c52bb \
-        4699eeb6501bad8ed982a279fb827390"
+DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/45c2cc37276d69e5b257507d97fd90d2a5684ccc/SPIRV-Headers-45c2cc37276d69e5b257507d97fd90d2a5684ccc.tar.gz \
+          https://github.com/KhronosGroup/SPIRV-Tools/archive/aa9e8f538041db3055ea443080e0ccc315fa114f/SPIRV-Tools-aa9e8f538041db3055ea443080e0ccc315fa114f.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.114.0/Vulkan-Headers-sdk-1.1.114.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.1.114.0/Vulkan-Loader-sdk-1.1.114.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.1.114.0/Vulkan-Tools-sdk-1.1.114.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.1.114.0/Vulkan-ValidationLayers-sdk-1.1.114.0.tar.gz \
+          https://github.com/KhronosGroup/glslang/archive/3cea2e5882e3455731a8b6657fb06db913eb3aa1/glslang-3cea2e5882e3455731a8b6657fb06db913eb3aa1.tar.gz"
+MD5SUM="5246ac55180130bf95aaaa24f3305c51 \
+        9e765d479dde70704936a26bfac8a208 \
+        652808b60901d4646264c877960b9d2b \
+        7836cf803548d39c3100bc24bcc208bc \
+        f5dc368e5feafec79d24a1d287df4733 \
+        07cdf6abc6a700c9264380951a438613 \
+        10dfaf401d008835bb07cfec742393ac"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"