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

[Sven-Hendrik Haase]

    Date: Wednesday, May 13, 2020 @ 22:52:43
  Author: svenstaro
Revision: 627797

upgpkg: openshadinglanguage 1.10.10-2

Modified:
  openshadinglanguage/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-13 22:52:16 UTC (rev 627796)
+++ PKGBUILD	2020-05-13 22:52:43 UTC (rev 627797)
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 pkgname=openshadinglanguage
 pkgver=1.10.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(x86_64)
 url="https://github.com/imageworks/OpenShadingLanguage"
@@ -8,18 +8,16 @@
 license=('custom')
 depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng'
          'libtiff' 'zlib' 'ncurses')
-makedepends=('boost' 'cmake' 'python' 'llvm' 'clang')
+makedepends=('boost' 'cmake' 'python' 'llvm' 'clang' 'ninja')
 source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
 sha512sums=('10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13')
 
-prepare() {
-  mkdir -p OpenShadingLanguage-Release-$pkgver/src/build
-}
-
 build() {
-  cd OpenShadingLanguage-Release-$pkgver/src/build
+  cd OpenShadingLanguage-Release-$pkgver
 
-  cmake ../.. \
+  cmake . \
+    -B build \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_CXX_STANDARD=14 \
@@ -26,13 +24,14 @@
     -DLLVM_STATIC=0 \
     -DENABLERTTI=ON \
     -DSTOP_ON_WARNING=OFF
-  make
+  ninja -C build
 }
 
 package() {
-  cd OpenShadingLanguage-Release-$pkgver/src/build
+  cd OpenShadingLanguage-Release-$pkgver
 
-  make DESTDIR="$pkgdir/" install
+  DESTDIR="$pkgdir/" ninja -C build install
+
   mkdir "$pkgdir"/usr/share/OSL
   mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders