[arch-commits] Commit in spirv-tools/trunk (PKGBUILD)

[Sven-Hendrik Haase via arch-commits]

    Date: Friday, March 4, 2022 @ 22:40:24
  Author: svenstaro
Revision: 438891

upgpkg: spirv-tools 2022.1-1

Modified:
  spirv-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-03-04 15:51:32 UTC (rev 438890)
+++ PKGBUILD    2022-03-04 22:40:24 UTC (rev 438891)
@@ -1,7 +1,7 @@
 # Maintainer: Laurent Carlier <lordhea...@gmail.com>
 
 pkgname=spirv-tools
-pkgver=2021.4
+pkgver=2022.1
 pkgrel=1
 pkgdesc="API and commands for processing SPIR-V modules"
 arch=('x86_64')
@@ -9,22 +9,15 @@
 license=('custom')
 groups=(vulkan-devel)
 depends=('gcc-libs')
-makedepends=('cmake' 'python' 'git' 'ninja')
-source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}";
-        "git+https://github.com/KhronosGroup/SPIRV-Headers.git";)
-sha256sums=('SKIP'
-            'SKIP')
+makedepends=('cmake' 'python' 'git' 'ninja' 'spirv-headers')
+source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}";)
+sha256sums=('SKIP')
 
-prepare() {
+build() {
   cd SPIRV-Tools
 
-  rm -rf build && mkdir build
-}
-
-build() {
-  cd SPIRV-Tools/build
-
-  cmake .. \
+  cmake \
+      -Bbuild \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_INSTALL_LIBDIR=lib \
@@ -32,15 +25,14 @@
       -DSPIRV_WERROR=Off \
       -DBUILD_SHARED_LIBS=ON \
       -DSPIRV_TOOLS_BUILD_STATIC=OFF \
-      -DSPIRV-Headers_SOURCE_DIR="${srcdir}"/SPIRV-Headers
-  ninja
+      -DSPIRV-Headers_SOURCE_DIR=/usr
+  ninja -C build
 }
 
 package() {
-  cd SPIRV-Tools/build
+  cd SPIRV-Tools
 
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
 
-  install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 ../LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }