Add ispc makedepend, switch to ninja, refactor.

1 files changed, 14 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bce70ed80a66..2d313b9394be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,9 @@
+#!/hint/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
+# shellcheck disable=SC2034,SC2154 # to allow unused/uninitialized variables.
+
 pkgname=oidn-git
-pkgver=1.1.0.r0.gc58c521
+pkgver=1.2.0.r3.gb6a0cf7
 #_fragment="#tag=v${pkgver}"
 pkgrel=1
 pkgdesc="Intel(R) Open Image Denoise library"
@@ -10,7 +13,7 @@ license=('Apache')
 depends=(intel-tbb python)
 provides=(openimagedenoise)
 conflicts=(openimagedenoise)
-makedepends=(git cmake)
+makedepends=(cmake git ispc ninja)
 source=("${pkgname%-git}::git+https://github.com/OpenImageDenoise/oidn.git${_fragment}"
         "git+https://github.com/OpenImageDenoise/mkl-dnn.git"
         "git+https://github.com/OpenImageDenoise/oidn-weights.git"
@@ -20,27 +23,24 @@ md5sums=('SKIP'
          'SKIP')
 
 prepare() {
-  cd ${srcdir}/${pkgname%-git}
-  git config submodule.mkl-dnn.url ${srcdir}/mkl-dnn
-  git config submodule.weights.url ${srcdir}/oidn-weights
-  git submodule update --init --recursive # --remote
+  git -C "${srcdir}"/${pkgname%-git} config submodule.mkl-dnn.url "${srcdir}"/mkl-dnn
+  git -C "${srcdir}"/${pkgname%-git} config submodule.weights.url "${srcdir}"/oidn-weights
+  git -C "${srcdir}"/${pkgname%-git} submodule update --init --recursive # --remote
 }
 
 pkgver() {
-  cd ${srcdir}/${pkgname%-git}
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git -C "${srcdir}"/${pkgname%-git} describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd ${srcdir}
-  mkdir -p build && cd build
-  cmake -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX=/usr/ ../${pkgname%-git}
-  make 
+  cmake -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX=/usr/ \
+        -G Ninja -B "build" -S "${srcdir}"/${pkgname%-git}
+# shellcheck disable=SC2086 # to allow multiple flags in MAKEFLAGS variable.
+  ninja -C "build" ${MAKEFLAGS:--j1} 
 }
 
 package() {
-  cd ${srcdir}/build
-  make install DESTDIR=${pkgdir}
+  DESTDIR=${pkgdir} ninja -C "build" install
 }
 
 # vim:set ts=2 sw=2 et: