graphics/vulkan-sdk: Updated for version 1.2.141.0.

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

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

3 files changed, 46 insertions, 26 deletions

diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
index 998834158707b..c6f0e97fc236e 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.131.2}
+VERSION=${VERSION:-1.2.141.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,9 +77,9 @@ cmake_build () {
 # Vulkan-ValidationLayers/scripts/known_good.json
 # glslang/known_good.json
 # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/1082
-GLSLANG_VERSION=${GLSLANG_VERSION:-4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3}
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-204cd131c42b90d129073719f2766293ce35c081}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-323a81fc5e30e43a04e5e22af4cba98ca2a161e6}
+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
@@ -98,12 +98,10 @@ cd $PRGNAM-$VERSION
   mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers
 )
 
-OLDVERSION=${OLDVERSION:-1.2.131.1}
-
-tar xvf $CWD/Vulkan-Headers-sdk-$OLDVERSION.tar.gz
+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
-tar xvf $CWD/Vulkan-Tools-sdk-$OLDVERSION.tar.gz
+tar xvf $CWD/Vulkan-Tools-sdk-$VERSION.tar.gz
 
 chown -R root:root .
 find -L . \
@@ -119,7 +117,7 @@ cmake_build \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_SKIP_RPATH=TRUE
 
-chdir Vulkan-Headers-sdk-$OLDVERSION
+chdir Vulkan-Headers-sdk-$VERSION
 
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
@@ -155,11 +153,13 @@ SLKCFLAGS="$ORIGCFLAGS"
 
 chdir Vulkan-ValidationLayers-sdk-$VERSION
 
+SPIRV_HEADERS='External/spirv-tools/external/spirv-headers'
+
 # 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
+patch -p1 < $CWD/vulkan-validationlayers-cmake.patch
 
 cmake_build \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
@@ -171,9 +171,10 @@ cmake_build \
   -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" \
   -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr
 
-chdir Vulkan-Tools-sdk-$OLDVERSION
+chdir Vulkan-Tools-sdk-$VERSION
 
 # Require an older cmake version.
 sed -i 's/3.10.2/3.5.2/' CMakeLists.txt
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
index 95ec646621dcd..65fe9c403c4c7 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.info
+++ b/graphics/vulkan-sdk/vulkan-sdk.info
@@ -1,20 +1,20 @@
 PRGNAM="vulkan-sdk"
-VERSION="1.2.131.2"
+VERSION="1.2.141.0"
 HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/204cd131c42b90d129073719f2766293ce35c081/SPIRV-Headers-204cd131c42b90d129073719f2766293ce35c081.tar.gz \
-          https://github.com/KhronosGroup/SPIRV-Tools/archive/323a81fc5e30e43a04e5e22af4cba98ca2a161e6/SPIRV-Tools-323a81fc5e30e43a04e5e22af4cba98ca2a161e6.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.131.1/Vulkan-Headers-sdk-1.2.131.1.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.131.2/Vulkan-Loader-sdk-1.2.131.2.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.131.1/Vulkan-Tools-sdk-1.2.131.1.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.131.2/Vulkan-ValidationLayers-sdk-1.2.131.2.tar.gz \
-          https://github.com/KhronosGroup/glslang/archive/4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3/glslang-4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3.tar.gz"
-MD5SUM="a52dc382c946eb44ea6f58d5b4dba597 \
-        bf1d5e2b0d9f5cf61ca69ff1db581734 \
-        24e3bb31d6ca00915ec34c6d91a82cbd \
-        1c031843e24e166ba7428dff69778902 \
-        a2c02b71a878ab549afed551a6aa57ab \
-        a396ccd4d3ca4b1420ff0de1fbddc49a \
-        1a2f2327ba83c393525a6d20844a6169"
+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_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch b/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch
new file mode 100644
index 0000000000000..797b1435e1aac
--- /dev/null
+++ b/graphics/vulkan-sdk/vulkan-validationlayers-cmake.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f328d7c7..45895dd4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,14 +117,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+                         -fno-builtin-memcmp
+                         -fvisibility=hidden)
+ 
+-    # Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older.
+-    if((CMAKE_COMPILER_IS_GNUCXX AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.3.0)) OR
+-       (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") AND
+-        (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0) AND
+-        (CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.0.0)))
+-        add_compile_options(-Werror)
+-    endif()
+-
+     set(CMAKE_C_STANDARD 99)
+     set(CMAKE_CXX_STANDARD 11)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")