diff options
Diffstat (limited to 'graphics/vulkan-sdk/vulkan-sdk.SlackBuild')
| -rw-r--r-- | graphics/vulkan-sdk/vulkan-sdk.SlackBuild | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild index 9988341587..c6f0e97fc2 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 |