diff options
Diffstat (limited to 'graphics/vulkan-sdk')
| -rw-r--r-- | graphics/vulkan-sdk/README | 2 | ||||
| -rw-r--r-- | graphics/vulkan-sdk/vulkan-sdk.SlackBuild | 150 | ||||
| -rw-r--r-- | graphics/vulkan-sdk/vulkan-sdk.info | 28 |
3 files changed, 95 insertions, 85 deletions
diff --git a/graphics/vulkan-sdk/README b/graphics/vulkan-sdk/README index 3226fd36df..0796ec1f1a 100644 --- a/graphics/vulkan-sdk/README +++ b/graphics/vulkan-sdk/README @@ -4,6 +4,8 @@ level Vulkan commands. Additionally, the loader manages inserting Vulkan layer libraries, including validation layers between the application and the ICD. +qt5 is an optional dependency for vkconfig. + This will not provide a vulkan driver which must be acquired elsewhere. This SlackBuild will compile vulkan-sdk from source. diff --git a/graphics/vulkan-sdk/vulkan-sdk.SlackBuild b/graphics/vulkan-sdk/vulkan-sdk.SlackBuild index 9988341587..86909bc79f 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.162.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,27 +59,34 @@ fi set -eu +# VulkanTools from LunarG doesn't support an external jsoncpp +JSONCPP_VERSION=${JSONCPP_VERSION:-1.8.0} + chdir () { cd -- "$SRC/$1"; printf %s\\n '' "Building $1" ''; } cmake_build () { mkdir -p build cd build cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ + -DCMAKE_SKIP_RPATH=TRUE \ -DCMAKE_BUILD_TYPE=Release \ "${@:-}" .. make make install DESTDIR=$PKG } -# For best compatibility use git versions which upstream also uses. -# 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} +copydocs () { + dir="$1" + mkdir -p -- "$PKG/usr/doc/$PRGNAM-$VERSION/$dir" + shift + for i do + cp -a -- "$dir-sdk-$VERSION/$i" "$PKG/usr/doc/$PRGNAM-$VERSION/$dir/" + done +} rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -87,24 +94,18 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION +tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.gz +tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VERSION.tar.gz +tar xvf $CWD/VulkanTools-sdk-$VERSION.tar.gz +tar xvf $CWD/gfxreconstruct-sdk-$VERSION.tar.gz ( - tar xvf $CWD/glslang-$GLSLANG_VERSION.tar.gz - cd glslang-$GLSLANG_VERSION/External - tar xvf $CWD/SPIRV-Tools-$SPIRV_TOOLS_VERSION.tar.gz - mv SPIRV-Tools-$SPIRV_TOOLS_VERSION spirv-tools - cd spirv-tools/external - tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.gz - mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers + cd VulkanTools-sdk-$VERSION/submodules + tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.gz + rm -rf jsoncpp + mv jsoncpp-$JSONCPP_VERSION jsoncpp ) -OLDVERSION=${OLDVERSION:-1.2.131.1} - -tar xvf $CWD/Vulkan-Headers-sdk-$OLDVERSION.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 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -112,31 +113,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -chdir glslang-$GLSLANG_VERSION - -cmake_build \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_SKIP_RPATH=TRUE - -chdir Vulkan-Headers-sdk-$OLDVERSION - -# Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt - -cmake_build +##################### +### vulkan-loader ### +##################### chdir Vulkan-Loader-sdk-$VERSION -ORIGCFLAGS="$SLKCFLAGS" - -# Fix build with clang on 32-bit systems -# https://github.com/gentoo/gentoo/pull/13369 -if [ "$ARCH" = i586 ] || [ "$ARCH" = i686 ] && - "${CC:-cc}" --version 2>/dev/null | grep -qi clang; then - SLKCFLAGS="$SLKCFLAGS -fno-integrated-as" -fi - # Require an older cmake version. sed -i 's/3.10.2/3.5.2/' CMakeLists.txt @@ -144,58 +126,88 @@ sed -i 's/3.10.2/3.5.2/' CMakeLists.txt patch -p1 < $CWD/vulkan-loader-cmake.patch cmake_build \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_SKIP_RPATH=TRUE \ -DBUILD_TESTS=OFF \ + -DBUILD_WSI_XCB_SUPPORT=ON \ + -DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr + -DVULKAN_HEADERS_INSTALL_DIR=/usr -SLKCFLAGS="$ORIGCFLAGS" +############################### +### vulkan-validationlayers ### +############################### chdir Vulkan-ValidationLayers-sdk-$VERSION # 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 - cmake_build \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_DATADIR=share \ - -DCMAKE_SKIP_RPATH=TRUE \ + -DBUILD_LAYER_SUPPORT_FILES=ON \ -DBUILD_TESTS=OFF \ - -DBUILD_WSI_XLIB_SUPPORT=ON \ + -DBUILD_WERROR=OFF \ -DBUILD_WSI_XCB_SUPPORT=ON \ + -DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DGLSLANG_INSTALL_DIR=$PKG/usr \ - -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr + -DGLSLANG_INSTALL_DIR=/usr \ + -DSPIRV_HEADERS_INSTALL_DIR=/usr \ + -DVULKAN_HEADERS_INSTALL_DIR=/usr + +################### +### vulkantools ### +################### + +chdir VulkanTools-sdk-$VERSION -chdir Vulkan-Tools-sdk-$OLDVERSION +# Generate missing jsoncpp sources +( + cd submodules/jsoncpp + python3 ./amalgamate.py +) # Require an older cmake version. -sed -i 's/3.10.2/3.5.2/' CMakeLists.txt +find . -type f -name CMakeLists.txt | xargs grep -l '3\.10\.2' | + xargs sed -i 's/3.10.2/3.5.2/' cmake_build \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_SKIP_RPATH=TRUE \ + -DBUILD_GMOCK=OFF \ + -DBUILD_WSI_XCB_SUPPORT=ON \ + -DBUILD_WSI_XLIB_SUPPORT=ON \ -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ + -DINSTALL_GTEST=OFF \ + -DVULKAN_HEADERS_INSTALL_DIR=/usr \ -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ - -DGLSLANG_INSTALL_DIR=$PKG/usr + -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr + +###################### +### gfxreconstruct ### +###################### + +chdir gfxreconstruct-sdk-$VERSION + +# Require an older cmake version. +sed -i 's/3.10.2/3.5.2/' CMakeLists.txt + +# cmake 3.5.2 does not have FILTER for the list command +sed -i '/generate_target_source_files(/d' cmake/CodeStyle.cmake + +cmake_build \ + -DBUILD_WERROR=OFF \ + -DVULKAN_HEADER=/usr/include/vulkan cd -- "$SRC" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Vulkan-Loader-sdk-$VERSION/*.txt \ - Vulkan-Loader-sdk-$VERSION/loader/LoaderAndLayerInterface.md \ - $PKG/usr/doc/$PRGNAM-$VERSION +copydocs Vulkan-Loader CODE_OF_CONDUCT.md CONTRIBUTING.md GOVERNANCE.md \ + LICENSE.txt README.md +copydocs Vulkan-ValidationLayers CODE_OF_CONDUCT.md CONTRIBUTING.md \ + GOVERNANCE.md LAYER_CONFIGURATION.md LICENSE.txt README.md +copydocs VulkanTools CONTRIBUTING.md GOVERNANCE.md LICENSE.txt README.md +copydocs gfxreconstruct CONTRIBUTING.md LICENSE.txt LICENSE_ThirdParty.txt \ + README.md USAGE_android.md USAGE_desktop.md + cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/graphics/vulkan-sdk/vulkan-sdk.info b/graphics/vulkan-sdk/vulkan-sdk.info index 95ec646621..879c8f7d73 100644 --- a/graphics/vulkan-sdk/vulkan-sdk.info +++ b/graphics/vulkan-sdk/vulkan-sdk.info @@ -1,22 +1,18 @@ PRGNAM="vulkan-sdk" -VERSION="1.2.131.2" +VERSION="1.2.162.0" HOMEPAGE="https://www.khronos.org/vulkan/" -DOWNLOAD="https://github.com/KhronosGroup/SPIRV-Headers/archive/204cd131c42b90d129073719f2766293ce35c081/SPIRV-Headers-204cd131c42b90d129073719f2766293ce35c081.tar.gz \ - https://github.com/KhronosGroup/SPIRV-Tools/archive/323a81fc5e30e43a04e5e22af4cba98ca2a161e6/SPIRV-Tools-323a81fc5e30e43a04e5e22af4cba98ca2a161e6.tar.gz \ - https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.131.1/Vulkan-Headers-sdk-1.2.131.1.tar.gz \ - https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.131.2/Vulkan-Loader-sdk-1.2.131.2.tar.gz \ - https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.131.1/Vulkan-Tools-sdk-1.2.131.1.tar.gz \ - https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.131.2/Vulkan-ValidationLayers-sdk-1.2.131.2.tar.gz \ - https://github.com/KhronosGroup/glslang/archive/4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3/glslang-4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3.tar.gz" -MD5SUM="a52dc382c946eb44ea6f58d5b4dba597 \ - bf1d5e2b0d9f5cf61ca69ff1db581734 \ - 24e3bb31d6ca00915ec34c6d91a82cbd \ - 1c031843e24e166ba7428dff69778902 \ - a2c02b71a878ab549afed551a6aa57ab \ - a396ccd4d3ca4b1420ff0de1fbddc49a \ - 1a2f2327ba83c393525a6d20844a6169" +DOWNLOAD="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.162.0/Vulkan-Loader-sdk-1.2.162.0.tar.gz \ + https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.162.0/Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz \ + https://github.com/LunarG/VulkanTools/archive/sdk-1.2.162.0/VulkanTools-sdk-1.2.162.0.tar.gz \ + https://github.com/LunarG/gfxreconstruct/archive/sdk-1.2.162.0/gfxreconstruct-sdk-1.2.162.0.tar.gz \ + https://github.com/open-source-parsers/jsoncpp/archive/1.8.0/jsoncpp-1.8.0.tar.gz" +MD5SUM="97de90f2b599979ea492a3ed92c025fb \ + 5c0c6daedacd2d535bb0cd41dcbd2995 \ + aa116fff3ef50d7c299bc168953eacec \ + 7d48f5d115f8baad2ed800769545f21a \ + 6d6cbd82b5fe4a9cbae4ffef01f9e9fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3" +REQUIRES="Vulkan-Headers glslang" MAINTAINER="Hunter Sezen" EMAIL="orbea@riseup.net" |