graphics/vulkan-sdk: Updated for version 1.2.154.0.

Signed-off-by: orbea <orbea@riseup.net>

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

2 files changed, 31 insertions, 56 deletions

diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
index c6f0e97fc2..05ee7d559f 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.2.141.0}
+VERSION=${VERSION:-1.2.154.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -73,31 +73,12 @@ cmake_build () {
   make install DESTDIR=$PKG
 }
 
-# For best compatibility use git versions which upstream also uses.
-# Vulkan-ValidationLayers/scripts/known_good.json
-# glslang/known_good.json
-# https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1082
-GLSLANG_VERSION=${GLSLANG_VERSION:-e00d27c6d65b7d3e72506a311d7f053da4051295}
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-ac638f1815425403e946d0ab78bac71d2bdbf3be}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-e128ab0d624ce7beb08eb9656bb260c597a46d0a}
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-
-(
-  tar xvf $CWD/glslang-$GLSLANG_VERSION.tar.gz
-  cd glslang-$GLSLANG_VERSION/External
-  tar xvf $CWD/SPIRV-Tools-$SPIRV_TOOLS_VERSION.tar.gz
-  mv SPIRV-Tools-$SPIRV_TOOLS_VERSION spirv-tools
-  cd spirv-tools/external
-  tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.gz
-  mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers
-)
-
 tar xvf $CWD/Vulkan-Headers-sdk-$VERSION.tar.gz
 tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz
 tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz
@@ -110,12 +91,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-chdir glslang-$GLSLANG_VERSION
-
-cmake_build \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_SKIP_RPATH=TRUE
+######################
+### vulkan-headers ###
+######################
 
 chdir Vulkan-Headers-sdk-$VERSION
 
@@ -124,16 +102,11 @@ sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
 
 cmake_build
 
-chdir Vulkan-Loader-sdk-$VERSION
-
-ORIGCFLAGS="$SLKCFLAGS"
+#####################
+### vulkan-loader ###
+#####################
 
-# Fix build with clang on 32-bit systems
-# https://github.com/gentoo/gentoo/pull/13369
-if [ "$ARCH" = i586 ] || [ "$ARCH" = i686 ] &&
-    "${CC:-cc}" --version 2>/dev/null | grep -qi clang; then
-  SLKCFLAGS="$SLKCFLAGS -fno-integrated-as"
-fi
+chdir Vulkan-Loader-sdk-$VERSION
 
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
@@ -149,11 +122,15 @@ cmake_build \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
   -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
 
-SLKCFLAGS="$ORIGCFLAGS"
+###############################
+### vulkan-validationlayers ###
+###############################
 
 chdir Vulkan-ValidationLayers-sdk-$VERSION
 
-SPIRV_HEADERS='External/spirv-tools/external/spirv-headers'
+# Use the system install path for spirv.hpp
+grep -rl spirv/unified1/spirv.hpp |
+  xargs sed -i 's|spirv/unified1/spirv.hpp|SPIRV/spirv.hpp|'
 
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
@@ -170,10 +147,14 @@ cmake_build \
   -DBUILD_WSI_XLIB_SUPPORT=ON \
   -DBUILD_WSI_XCB_SUPPORT=ON \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
-  -DGLSLANG_INSTALL_DIR=$PKG/usr \
-  -DSPIRV_HEADERS_INSTALL_DIR="$SRC/glslang-$GLSLANG_VERSION/$SPIRV_HEADERS" \
+  -DGLSLANG_INSTALL_DIR=/usr \
+  -DSPIRV_HEADERS_INSTALL_DIR=/usr/include/glslang \
   -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
 
+####################
+### vulkan-tools ###
+####################
+
 chdir Vulkan-Tools-sdk-$VERSION
 
 # Require an older cmake version.
@@ -186,7 +167,7 @@ cmake_build \
   -DBUILD_WSI_WAYLAND_SUPPORT=OFF \
   -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \
   -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \
-  -DGLSLANG_INSTALL_DIR=$PKG/usr
+  -DGLSLANG_INSTALL_DIR=/usr
 
 cd -- "$SRC"
 
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
index 65fe9c403c..690a0ba39b 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ b/graphics/vulkan-sdk/vulkan-sdk.info
@@ -1,22 +1,16 @@
 PRGNAM="vulkan-sdk"
-VERSION="1.2.141.0"
+VERSION="1.2.154.0"
 HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/ac638f1815425403e946d0ab78bac71d2bdbf3be/SPIRV-Headers-ac638f1815425403e946d0ab78bac71d2bdbf3be.tar.gz \
-          https://github.com/KhronosGroup/SPIRV-Tools/archive/e128ab0d624ce7beb08eb9656bb260c597a46d0a/SPIRV-Tools-e128ab0d624ce7beb08eb9656bb260c597a46d0a.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.141.0/Vulkan-Headers-sdk-1.2.141.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.141.0/Vulkan-Loader-sdk-1.2.141.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.141.0/Vulkan-Tools-sdk-1.2.141.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.141.0/Vulkan-ValidationLayers-sdk-1.2.141.0.tar.gz \
-          https://github.com/KhronosGroup/glslang/archive/e00d27c6d65b7d3e72506a311d7f053da4051295/glslang-e00d27c6d65b7d3e72506a311d7f053da4051295.tar.gz"
-MD5SUM="4dde857e9ecfe44025478876286f0915 \
-        118a03167510564c9453534adb379c46 \
-        4067d1268504c4e2bb47135aea55ae17 \
-        87e41363a65bba24cd1231557b4bca8c \
-        d74d6536dfa19a972149a5e41830249c \
-        5baf1ca0e462c72140748bf82cd31eb4 \
-        88f06a4835895a46fa073035084b0f48"
+DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.154.0/Vulkan-Headers-sdk-1.2.154.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.154.0/Vulkan-Loader-sdk-1.2.154.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.154.0/Vulkan-Tools-sdk-1.2.154.0.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.154.0/Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz"
+MD5SUM="f5905669df03cf99aad45707e066c2c2 \
+        26e6ad81252d01f27322851c01ea4ed4 \
+        8d499320da34b08206c762f5ce34fd72 \
+        922b963cc146acee9246927f4b79255b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3"
+REQUIRES="glslang"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"