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

[Sven-Hendrik Haase]

    Date: Wednesday, March 28, 2018 @ 22:52:47
  Author: svenstaro
Revision: 313190

upgpkg: openshadinglanguage 1.9.7-1

Modified:
  openshadinglanguage/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-28 22:30:56 UTC (rev 313189)
+++ PKGBUILD	2018-03-28 22:52:47 UTC (rev 313190)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=openshadinglanguage
-pkgver=1.7.6
-pkgrel=4
+pkgver=1.9.7
+pkgrel=1
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(x86_64)
 url="https://github.com/imageworks/OpenShadingLanguage"
@@ -9,11 +9,9 @@
 license=('custom')
 depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng'
          'libtiff' 'zlib' 'ncurses')
-makedepends=('boost' 'cmake' 'llvm35' 'clang35')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
-        llvm-static-system-libs.patch)
-sha512sums=('c0f0f1aece6be0aca9751dd53063b2f3f14482d21304e0606c21f786d00adfb92025ca10c928bbc9b591a862aada0393efd62b4e27e39669e013264a2cb5c1ef'
-            '50f1e9a3e88b0b4e328778d4d8eb30989e1dfed0abe1bb84681dc8d368f343f3052dd975d7d500113d39f34bb8b59415c7a4e6dd841bc8d44de250a3b7f6aeec')
+makedepends=('boost' 'cmake' 'llvm' 'clang')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
+sha512sums=('ab232e45eaecb9d56938bfbd2a76999c3dc3033c31cdae3bd48f18642f98211b7255aa2a11bfda13a29100f4bfeade0643d34cb5007d23662894a48139b166e5')
 
 prepare() {
   cd OpenShadingLanguage-Release-$pkgver
@@ -20,7 +18,7 @@
 
   # Add system libraries needed to link against LLVM components (zlib, ncurses)
   # This is required in order to statically link against LLVM
-  patch -Np1 < $srcdir/llvm-static-system-libs.patch
+  #patch -Np1 < $srcdir/llvm-static-system-libs.patch
 }
 
 build() {
@@ -31,7 +29,8 @@
 
   cmake ../.. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLLVM_STATIC=1 \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DLLVM_STATIC=0 \
     -DOSL_BUILD_CPP11=1 \
     -DENABLERTTI=ON \
     -DSTOP_ON_WARNING=OFF
@@ -43,12 +42,7 @@
 
   make DESTDIR="$pkgdir/" install
 
-  mkdir -p "$pkgdir"/usr/share/OSL/
-  mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
-  mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit
-  mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/
-  mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc
-  mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders
+  install -Dm644 "$pkgdir"/usr/share/doc/OSL/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 # vim:set ts=2 sw=2 et: