diff options
Diffstat (limited to 'graphics/vulkan-sdk/vulkan-sdk.SlackBuild')
| -rw-r--r-- | graphics/vulkan-sdk/vulkan-sdk.SlackBuild | 18 |
1 files changed, 11 insertions, 7 deletions
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 <math.h>/i#include <cmath>\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" \ |