From 41235556234327c494e130d1873f07f551533a4b Mon Sep 17 00:00:00 2001 From: Hunter Sezen Date: Sat, 21 Sep 2019 05:52:36 +0700 Subject: graphics/vulkan-sdk: Updated for version 1.1.121.0. Signed-off-by: Willy Sudiarto Raharjo --- graphics/vulkan-sdk/cmath.patch | 50 +++++++++++++++++++++++++++++++ graphics/vulkan-sdk/vulkan-sdk.SlackBuild | 18 ++++++----- graphics/vulkan-sdk/vulkan-sdk.info | 30 +++++++++---------- 3 files changed, 76 insertions(+), 22 deletions(-) create mode 100644 graphics/vulkan-sdk/cmath.patch diff --git a/graphics/vulkan-sdk/cmath.patch b/graphics/vulkan-sdk/cmath.patch new file mode 100644 index 0000000000..1060fe600d --- /dev/null +++ b/graphics/vulkan-sdk/cmath.patch @@ -0,0 +1,50 @@ +From 80ddc06b39dd1164733b69b68231b497f51840ad Mon Sep 17 00:00:00 2001 +From: orbea +Date: Tue, 10 Sep 2019 10:33:19 -0700 +Subject: [PATCH] Fix build with gcc5. + +v2: Replace all instances of math.h with cmath. +--- + layers/core_validation.cpp | 1 - + layers/parameter_validation_utils.cpp | 2 +- + tests/vktestframework.cpp | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp +index 4c3da8b5f..359c21e32 100644 +--- a/layers/core_validation.cpp ++++ b/layers/core_validation.cpp +@@ -44,7 +44,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp +index 1559ac455..6e67586f5 100644 +--- a/layers/parameter_validation_utils.cpp ++++ b/layers/parameter_validation_utils.cpp +@@ -21,7 +21,7 @@ + + #define NOMINMAX + +-#include ++#include + + #include "chassis.h" + #include "stateless_validation.h" +diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp +index 0d9dd584a..ad0338517 100644 +--- a/tests/vktestframework.cpp ++++ b/tests/vktestframework.cpp +@@ -38,7 +38,7 @@ + #pragma warning(pop) + #endif + #include +-#include ++#include + + #if defined(PATH_MAX) && !defined(MAX_PATH) + #define MAX_PATH PATH_MAX diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild index 4983b8e845..4b89d23d1e 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.114.0} +VERSION=${VERSION:-1.1.121.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -76,9 +76,9 @@ cmake_build () { # 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} +GLSLANG_VERSION=${GLSLANG_VERSION:-34953810a62c5230cc059cfdf42dc44c5aab2246} +SPIRV_HEADERS_VERSION=${SPIRV_HEADERS_VERSION:-38cafab379e5d16137cb97a485b9385191039b92} +SPIRV_TOOLS_VERSION=${SPIRV_TOOLS_VERSION:-9b3cc3e05337358d0bd9fec1b7a51e3cbf55312b} rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -118,6 +118,9 @@ cmake_build \ chdir Vulkan-Headers-sdk-$VERSION +# Require an older cmake version. +sed -i 's/3.10.2/3.5.2/' CMakeLists.txt + cmake_build chdir Vulkan-Loader-sdk-$VERSION @@ -141,9 +144,10 @@ sed -i 's/3.10.2/3.5.2/' CMakeLists.txt # Disable hardcoded errors sed -i '/-Werror/d' CMakeLists.txt -# Workaround build error in 14.2 -sed -i '/#include /i#include \n' \ - layers/parameter_validation_utils.cpp +# Fix build with gcc5. +# https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/1240 +# https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/80ddc06b39dd1164733b69b68231b497f51840ad +patch -p1 < $CWD/cmath.patch cmake_build \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info index fdb98db77a..c3b8f9b566 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.114.0" +VERSION="1.1.121.0" HOMEPAGE="https://www.khronos.org/vulkan/" -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="https://github.com/KhronosGroup/SPIRV-Headers/archive/38cafab379e5d16137cb97a485b9385191039b92/SPIRV-Headers-38cafab379e5d16137cb97a485b9385191039b92.tar.gz \ + https://github.com/KhronosGroup/SPIRV-Tools/archive/9b3cc3e05337358d0bd9fec1b7a51e3cbf55312b/SPIRV-Tools-9b3cc3e05337358d0bd9fec1b7a51e3cbf55312b.tar.gz \ + https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.121.0/Vulkan-Headers-sdk-1.1.121.0.tar.gz \ + https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.1.121.0/Vulkan-Loader-sdk-1.1.121.0.tar.gz \ + https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.1.121.0/Vulkan-Tools-sdk-1.1.121.0.tar.gz \ + https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.1.121.0/Vulkan-ValidationLayers-sdk-1.1.121.0.tar.gz \ + https://github.com/KhronosGroup/glslang/archive/34953810a62c5230cc059cfdf42dc44c5aab2246/glslang-34953810a62c5230cc059cfdf42dc44c5aab2246.tar.gz" +MD5SUM="4d2cc6ae9deb7df3a4f05bf6de94a997 \ + 7a27f5d9eb8e75d333284a93eaf58663 \ + 6a19a3244f0bfdb0f9cc5ce342b5bd38 \ + 6c437cf1c5d288c1c7b19ce13a33e426 \ + 8b4421281a8854af63e74515f87023a1 \ + 57706105b91ff5e9c1ae3020286f9fba \ + 14011b4251ed8790597f0ee4fbfeaefe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" -- cgit v1.2.3