aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2020-01-01 09:50:06 -0800
committerRobby Workman <rworkman@slackbuilds.org>2020-01-03 02:11:40 -0600
commit03c31a3e74867a3370c5009595a8bbdf6f3dc92a (patch)
tree98c476af33a0d3ad7167a05d13a42ed0757f0176
parent3df0be24fce5ff33e33f61a7c3281c2df0973e0c (diff)
graphics/vulkan-sdk: Updated for version 1.1.130.0.
Signed-off-by: orbea <orbea@riseup.net>
-rw-r--r--graphics/vulkan-sdk/glslang-revert.patch30
-rw-r--r--graphics/vulkan-sdk/vulkan-sdk.SlackBuild17
-rw-r--r--graphics/vulkan-sdk/vulkan-sdk.info30
3 files changed, 20 insertions, 57 deletions
diff --git a/graphics/vulkan-sdk/glslang-revert.patch b/graphics/vulkan-sdk/glslang-revert.patch
deleted file mode 100644
index e5a475916193..000000000000
--- a/graphics/vulkan-sdk/glslang-revert.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 199d115e1542fe0a8427efda5fa36158474fb6cf Mon Sep 17 00:00:00 2001
-From: John Kessenich <cepheus@frii.com>
-Date: Tue, 5 Nov 2019 18:05:42 -0700
-Subject: [PATCH] Fix #1959 by reverting 7b0e236 to put files in two places.
-
----
- SPIRV/CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
- mode change 100644 => 100755 SPIRV/CMakeLists.txt
-
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-old mode 100644
-new mode 100755
-index e25ec0a13..9869bafdc
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS SPIRV EXPORT SPIRVTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
--
-- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-- install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-
-+ install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-+ install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+
-+ install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
- install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
index 853c38a2e31d..bdf2da4d8ffc 100644
--- a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -4,7 +4,7 @@
# Copyright 2016, 2017 Heinz Wiesinger, Amsterdam, The Netherlands
# Copyright 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2019 Hunter Sezen California, USA
+# Copyright 2019-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=vulkan-sdk
-VERSION=${VERSION:-1.1.126.0}
+VERSION=${VERSION:-1.1.130.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:-b131630e7c749a5dc19faa458024260c71fb170f}
-SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-af64a9e826bf5bb5fcd2434dd71be1e41e922563}
-SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-02910ffdffaa2966f613ede0c516645f5555c13c}
+GLSLANG_VERSION=${GLSLANG_VERSION:-ebf634bcaa3e46ca8a912ed05b87281c731b2391}
+SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-204cd131c42b90d129073719f2766293ce35c081}
+SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2}
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -112,13 +112,6 @@ find -L . \
chdir glslang-$GLSLANG_VERSION
-# Fix #1959 by reverting 7b0e236 to put files in two places.
-# https://github.com/KhronosGroup/glslang/commit/199d115e1542fe0a8427efda5fa36158474fb6cf
-# https://github.com/KhronosGroup/glslang/pull/1963
-# https://github.com/KhronosGroup/glslang/issues/1959
-# https://code.videolan.org/videolan/libplacebo/issues/71
-patch -p1 < $CWD/glslang-revert.patch
-
cmake_build \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info
index 2eb194b4439d..82fa1fd4fc42 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.126.0"
+VERSION="1.1.130.0"
HOMEPAGE="https://www.khronos.org/vulkan/"
-DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/af64a9e826bf5bb5fcd2434dd71be1e41e922563/SPIRV-Headers-af64a9e826bf5bb5fcd2434dd71be1e41e922563.tar.gz \
- https://github.com/KhronosGroup/SPIRV-Tools/archive/02910ffdffaa2966f613ede0c516645f5555c13c/SPIRV-Tools-02910ffdffaa2966f613ede0c516645f5555c13c.tar.gz \
- https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.126.0/Vulkan-Headers-sdk-1.1.126.0.tar.gz \
- https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.1.126.0/Vulkan-Loader-sdk-1.1.126.0.tar.gz \
- https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.1.126.0/Vulkan-Tools-sdk-1.1.126.0.tar.gz \
- https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.1.126.0/Vulkan-ValidationLayers-sdk-1.1.126.0.tar.gz \
- https://github.com/KhronosGroup/glslang/archive/b131630e7c749a5dc19faa458024260c71fb170f/glslang-b131630e7c749a5dc19faa458024260c71fb170f.tar.gz"
-MD5SUM="1928d2983a91d245bade6a1ebb103578 \
- 4d809863ad9d0e5003684542533c65ae \
- 28254c1ace5aaa2d04221b3bfb2e01c1 \
- 8c435cf0840df4d985205c3513ecaf44 \
- d7ebc4991620ff33d9929494e54cb0ab \
- 2bfa2f064392bde70c5e6fab53b35416 \
- d3dfe608aca53f208b69d19a9f14af5a"
+DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/204cd131c42b90d129073719f2766293ce35c081/SPIRV-Headers-204cd131c42b90d129073719f2766293ce35c081.tar.gz \
+ https://github.com/KhronosGroup/SPIRV-Tools/archive/5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2/SPIRV-Tools-5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2.tar.gz \
+ https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.130.0/Vulkan-Headers-sdk-1.1.130.0.tar.gz \
+ https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.1.130.0/Vulkan-Loader-sdk-1.1.130.0.tar.gz \
+ https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.1.130.0/Vulkan-Tools-sdk-1.1.130.0.tar.gz \
+ https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.1.130.0/Vulkan-ValidationLayers-sdk-1.1.130.0.tar.gz \
+ https://github.com/KhronosGroup/glslang/archive/ebf634bcaa3e46ca8a912ed05b87281c731b2391/glslang-ebf634bcaa3e46ca8a912ed05b87281c731b2391.tar.gz"
+MD5SUM="a52dc382c946eb44ea6f58d5b4dba597 \
+ 789fb3cf18e03548681f1ee530d808e5 \
+ 060f522e0d669c7dec14b3fd1ed85fb7 \
+ 857a8ec5b90d681aa0c66d0e8e8f298f \
+ 01d0270dfa3f5b23cf13fecd3d4d8537 \
+ 25c9a2c34457ecf81c248e34c02ad983 \
+ 0646196d37ae32c53fbacd5f10e8f2dd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python3"