diff options
Diffstat (limited to 'source/x/vulkan-sdk')
| -rwxr-xr-x | source/x/vulkan-sdk/fetch-sources.sh | 4 | ||||
| -rw-r--r-- | source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch | 30 | ||||
| -rwxr-xr-x | source/x/vulkan-sdk/vulkan-sdk.SlackBuild | 5 |
3 files changed, 3 insertions, 36 deletions
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index 48e51e3d..a7ad23f1 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -27,8 +27,8 @@ # # Example: VERSION=1.1.92.1 ./fetch-sources.sh -VERSION=${VERSION:-1.1.126.0} -BRANCH=${BRANCH:-sdk-1.1.126} +VERSION=${VERSION:-1.1.130.0} +BRANCH=${BRANCH:-sdk-1.1.130} rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \ Vulkan-Headers-sdk-${VERSION}* \ diff --git a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch b/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch deleted file mode 100644 index e5a47591..00000000 --- a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.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/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index 32687831..3ed33960 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vulkan-sdk VERSION=${VERSION:-$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -96,9 +96,6 @@ mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers cd $TMP/glslang-${GLSLANG_VERSION} -# Upstream revert to fix building shaderc (and others): -zcat $CWD/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |