diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/x/vulkan-sdk | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/vulkan-sdk')
-rwxr-xr-x | source/x/vulkan-sdk/fetch-sources.sh | 102 | ||||
-rw-r--r-- | source/x/vulkan-sdk/slack-desc | 19 | ||||
-rwxr-xr-x | source/x/vulkan-sdk/vulkan-sdk.SlackBuild | 181 | ||||
-rw-r--r-- | source/x/vulkan-sdk/vulkan-sdk.url | 4 |
4 files changed, 306 insertions, 0 deletions
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh new file mode 100755 index 00000000..590849a5 --- /dev/null +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +# Copyright 2017 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Call this script with the version of the Vulkan-LoaderAndValidationLayers-sdk +# that you would like to fetch the sources for. This will fetch the SDK from +# github, and then look at the revisions listed in the external_revisions +# directory to fetch the proper glslang, SPIRV-Headers, and SPIRV-Tools. +# +# Example: VERSION=1.1.70.0 ./fetch-sources.sh + +VERSION=${VERSION:-1.1.70.0} + +# Remove existing sources: +rm -rf Vulkan-LoaderAndValidationLayers-sdk* glslang-* SPIRV-Headers-* SPIRV-Tools-* + +# Fetch SDK: +lftpget https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${VERSION}/Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz + +GLSLANG_REVISION=$(tar xOf Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz Vulkan-LoaderAndValidationLayers-sdk-${VERSION}/external_revisions/glslang_revision) + +git clone https://github.com/KhronosGroup/glslang.git glslang-$GLSLANG_REVISION +cd glslang-$GLSLANG_REVISION +git checkout $GLSLANG_REVISION +SPIRV_TOOLS_REVISION=$( +python3 - << EOF +import json +with open('known_good.json') as f: + known_good = json.load(f) +commits = known_good['commits'] +print(commits[0]['commit']) +EOF +) +SPIRV_HEADERS_REVISION=$( +python3 - << EOF +import json +with open('known_good.json') as f: + known_good = json.load(f) +commits = known_good['commits'] +print(commits[1]['commit']) +EOF +) +# Cleanup. We're not packing up the whole git repo. +find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null +cd .. +tar cf glslang-${GLSLANG_REVISION}.tar glslang-${GLSLANG_REVISION} +rm -rf glslang-${GLSLANG_REVISION} +plzip -9 glslang-${GLSLANG_REVISION}.tar + +git clone https://github.com/KhronosGroup/SPIRV-Headers.git SPIRV-Headers-${SPIRV_HEADERS_REVISION} +cd SPIRV-Headers-${SPIRV_HEADERS_REVISION} +git checkout ${SPIRV_HEADERS_REVISION} +# Cleanup. We're not packing up the whole git repo. +find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null +cd .. +tar cf SPIRV-Headers-${SPIRV_HEADERS_REVISION}.tar SPIRV-Headers-${SPIRV_HEADERS_REVISION} +rm -rf SPIRV-Headers-${SPIRV_HEADERS_REVISION} +plzip -9 SPIRV-Headers-${SPIRV_HEADERS_REVISION}.tar + +git clone https://github.com/KhronosGroup/SPIRV-Tools.git SPIRV-Tools-${SPIRV_TOOLS_REVISION} +cd SPIRV-Tools-${SPIRV_TOOLS_REVISION} +git checkout ${SPIRV_TOOLS_REVISION} +# Only purge the .pack, since spirv_tools_commit_id.h needs to query the repo: +rm -f .git/objects/pack/pack-*.pack +cd .. +tar cf SPIRV-Tools-${SPIRV_TOOLS_REVISION}.tar SPIRV-Tools-${SPIRV_TOOLS_REVISION} +rm -rf SPIRV-Tools-${SPIRV_TOOLS_REVISION} +plzip -9 SPIRV-Tools-${SPIRV_TOOLS_REVISION}.tar + +# Repack Vulkan-LoaderAndValidationLayers-sdk: +gzip -d Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz +plzip -9 Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar + +# List URLs in vulkan-sdk.url: +echo "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${VERSION}/Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz" > vulkan-sdk.url +echo "https://github.com/KhronosGroup/glslang/archive/${GLSLANG_REVISION}/glslang-${GLSLANG_REVISION}.tar.gz" >> vulkan-sdk.url +echo "https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_REVISION}/SPIRV-Headers-${SPIRV_HEADERS_REVISION}.tar.gz" >> vulkan-sdk.url +echo "https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_REVISION}/SPIRV-Tools-${SPIRV_TOOLS_REVISION}.tar.gz" >> vulkan-sdk.url + +# Fix timestamps to be correct: +for file in *.tar.?z ; do + TIMESTAMP="$(tar tvf $file | head -1 | cut -b 32-47)" + touch -d "$TIMESTAMP" $file +done diff --git a/source/x/vulkan-sdk/slack-desc b/source/x/vulkan-sdk/slack-desc new file mode 100644 index 00000000..1d3eec17 --- /dev/null +++ b/source/x/vulkan-sdk/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +vulkan-sdk: vulkan-sdk (Vulkan ICD Loader and Validation Layers) +vulkan-sdk: +vulkan-sdk: Vulkan supports multiple GPUs and multiple global contexts +vulkan-sdk: (VkInstance). The ICD loader is necessary to support multiple GPUs +vulkan-sdk: and the VkInstance level Vulkan commands. Additionally, the loader +vulkan-sdk: manages inserting Vulkan layer libraries, including validation layers +vulkan-sdk: between the application and the ICD. +vulkan-sdk: +vulkan-sdk: Homepage: https://www.khronos.org/vulkan/ +vulkan-sdk: +vulkan-sdk: diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild new file mode 100755 index 00000000..2d28da17 --- /dev/null +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -0,0 +1,181 @@ +#!/bin/bash + +# Slackware build script for vulkan-sdk + +# Copyright 2016, 2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=vulkan-sdk +VERSION=${VERSION:-$(echo Vulkan-LoaderAndValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-vulkan-sdk + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf Vulkan-LoaderAndValidationLayers-sdk-$VERSION +tar xvf $CWD/Vulkan-LoaderAndValidationLayers-sdk-$VERSION.tar.?z || exit 1 +cd Vulkan-LoaderAndValidationLayers-sdk-$VERSION || exit 1 + +GLSLANG_VERSION=$(cat external_revisions/glslang_revision | head -n 1) +SPIRV_HEADERS_VERSION=$(basename SPIRV-Headers-* .tar.?z | rev | cut -d - -f 1 | rev) +SPIRV_TOOLS_VERSION=$(basename SPIRV-Tools-* .tar.?z | rev | cut -d - -f 1 | rev) + +mkdir external + +cd external + tar xf $CWD/glslang-${GLSLANG_VERSION}.tar.?z || exit 1 + mv glslang-${GLSLANG_VERSION} glslang + +cd glslang/External +tar xf $CWD/SPIRV-Tools-${SPIRV_TOOLS_VERSION}.tar.?z* || exit 1 +mv SPIRV-Tools-${SPIRV_TOOLS_VERSION} spirv-tools + +mkdir -p spirv-tools/external +cd spirv-tools/external + tar xvf $CWD/SPIRV-Headers-${SPIRV_HEADERS_VERSION}.tar.?z* || exit 1 + mv SPIRV-Headers-${SPIRV_HEADERS_VERSION} spirv-headers + +cd $TMP/Vulkan-LoaderAndValidationLayers-sdk-$VERSION + +# chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p external/{glslang,spirv-tools}/build +mkdir -p build +mkdir -p build-demos + +# Fix LIBDIRSUFFIX +for i in $(find external -name CMakeLists.txt); do + sed -i "s|DESTINATION lib|DESTINATION \${CMAKE_INSTALL_LIBDIR}|" "$i" +done + +cd external/glslang/build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \ + -DCMAKE_BUILD_TYPE=Release \ + .. + + make $NUMJOBS VERBOSE=1 || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd - + +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_INSTALL_DATADIR=/share \ + -DCMAKE_SKIP_RPATH=True \ + -DBUILD_TESTS=Off \ + -DBUILD_DEMOS=On \ + -DBUILD_WSI_XLIB_SUPPORT=On \ + -DBUILD_WSI_XCB_SUPPORT=On \ + -DBUILD_WSI_WAYLAND_SUPPORT=Off \ + -DBUILD_WSI_MIR_SUPPORT=Off \ + -DCMAKE_BUILD_TYPE=Release \ + -DGLSLANG_VALIDATOR=../external/glslang/build/StandAlone/glslangValidator \ + .. + + make $NUMJOBS VERBOSE=1 || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +mkdir -p $PKG/usr/share/vulkan/{explicit,implicit}_layer.d + +mv $PKG/etc/vulkan/explicit_layer.d/*.json $PKG/usr/share/vulkan/explicit_layer.d/ +mv $PKG/usr/bin/smoketest $PKG/usr/bin/vulkan-smoketest + +# Use headers from spirv-headers as they are newer than the ones installed by glslang +for i in spirv.h spirv.hpp spirv.hpp11; do + install -m 0644 external/glslang/External/spirv-tools/external/spirv-headers/include/spirv/1.2/$i \ + $PKG/usr/include/SPIRV/ +done + +## I don't know why this is here, so I'm commenting it out. ;-) +#( cd $PKG/usr/include +# ln -sf SPIRV spirv +#) + +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/$PKGNAM-$VERSION +cp -a *.md LICENSE.txt loader/LoaderAndLayerInterface.md \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/vulkan-sdk/vulkan-sdk.url b/source/x/vulkan-sdk/vulkan-sdk.url new file mode 100644 index 00000000..ed3b9659 --- /dev/null +++ b/source/x/vulkan-sdk/vulkan-sdk.url @@ -0,0 +1,4 @@ +https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.70.0/Vulkan-LoaderAndValidationLayers-sdk-1.1.70.0.tar.gz +https://github.com/KhronosGroup/glslang/archive/2651ccaec8/glslang-2651ccaec8.tar.gz +https://github.com/KhronosGroup/SPIRV-Headers/archive/ce309203d7eceaf908bea8862c27f3e0749f7d00/SPIRV-Headers-ce309203d7eceaf908bea8862c27f3e0749f7d00.tar.gz +https://github.com/KhronosGroup/SPIRV-Tools/archive/9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8/SPIRV-Tools-9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8.tar.gz |