commit f4f4915f8747014103929b534bd597b8c36dfd84 Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Aug 30 19:07:30 2019 +1000 spirv-tools: 2019.2 -> 2019.4 diff --git a/spirv-tools/.footprint b/spirv-tools/.footprint index 14b90471b..c49250fe0 100644 --- a/spirv-tools/.footprint +++ b/spirv-tools/.footprint @@ -7,7 +7,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/spirv-link -rwxr-xr-x root/root usr/bin/spirv-opt -rwxr-xr-x root/root usr/bin/spirv-reduce --rwxr-xr-x root/root usr/bin/spirv-stats -rwxr-xr-x root/root usr/bin/spirv-val drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/spirv-tools/ diff --git a/spirv-tools/.signature b/spirv-tools/.signature index 6dbf0240f..ea09bb3e2 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bCpzViK4tvp5okkrbwW35rqexebwMvaPcvmR33tor+vQnL+UZs+wx/m1hGiRm4xClAJZ48x1kQhInCbPEkXiwM= -SHA256 (Pkgfile) = 50597b286bf9caccd60498db951706d8fdbb903c4c6daae5b17cc132f543a4b6 -SHA256 (.footprint) = 26c4c01f8dae69d79601f9a86e85f1ead5957e8b5f81c49cddd92d3ce76cc4be -SHA256 (SPIRV-Tools-v2019.2.tar.gz) = 1fde9d2a0df920a401441cd77253fc7b3b9ab0578eabda8caaaceaa6c7638440 +RWSE3ohX2g5d/e9OqwXzAiUZWl+CaMtSDjhApJKAQYqnL+nqX74wGmmGdP3578LzNShmyWmYCeIZdo9dN9opX/dXani1Nj6JqQ8= +SHA256 (Pkgfile) = 7e09f41917f5233bbfddfdbf6a7fc21823d4444baaa0914faf8ba01815781f73 +SHA256 (.footprint) = 5c67a8d63c2309bc78e38f5a64431991456f37074c60f62a1d1652b67c18514e +SHA256 (aa9e8f538041db3055ea443080e0ccc315fa114f) = 7d84713e5760108991edb02b0e65dcf46ce7a1137108a46a9e9d204c8a8fb40d diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index 0ce4ec491..c9a9f6522 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -1,15 +1,23 @@ # Description: API and commands for processing SPIR-V modules # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: python3 spirv-headers +# Depends on: python3 spirv-headers ninja name=spirv-tools -version=2019.2 -release=3 -source=(https://github.com/KhronosGroup/SPIRV-Tools/archive//v$version/SPIRV-Tools-v...) +version=2019.4 +commit=aa9e8f538041db3055ea443080e0ccc315fa114f +release=1 +source=( + #https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$... + https://codeload.github.com/KhronosGroup/SPIRV-Tools/zip/$commit +) build() { - cd SPIRV-Tools-$version + mv $commit SPIRV-Tools-$commit.zip + bsdtar -xf SPIRV-Tools-$commit.zip + +# cd SPIRV-Tools-$version + cd SPIRV-Tools-$commit mkdir build-{shared,static} @@ -17,19 +25,21 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ --DSPIRV_WERROR=Off \ --DSPIRV-Headers_SOURCE_DIR=/usr" +-DSPIRV_WERROR=OFF \ +-DSPIRV-Headers_SOURCE_DIR=/usr \ +-DPYTHON_EXECUTABLE=/usr/bin/python3 \ +-G Ninja" (cd build-static cmake .. $config -DBUILD_SHARED_LIBS=OFF - make + ninja ) (cd build-shared cmake .. $config -DBUILD_SHARED_LIBS=ON - make + ninja ) - make -C build-static DESTDIR=$PKG install - make -C build-shared DESTDIR=$PKG install + DESTDIR=$PKG ninja -C build-static install + DESTDIR=$PKG ninja -C build-shared install }