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

[Sven-Hendrik Haase]

    Date: Sunday, September 7, 2014 @ 04:39:15
  Author: svenstaro
Revision: 118512

upgpkg: openshadinglanguage 1.5.10-2

llvm 3.5 rebuild

Modified:
  openshadinglanguage/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-07 01:45:20 UTC (rev 118511)
+++ PKGBUILD	2014-09-07 02:39:15 UTC (rev 118512)
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=openshadinglanguage
 pkgver=1.5.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(i686 x86_64)
 url="https://github.com/imageworks/OpenShadingLanguage"
@@ -9,24 +9,32 @@
 license=('custom')
 depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm')
 makedepends=('boost' 'cmake' 'clang')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
-md5sums=('b828366f056e115b539ee1780883fc7d')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+        https://github.com/imageworks/OpenShadingLanguage/commit/163df11a3af32295757cfe008d1ba2b757cc7b7b.patch
+        https://github.com/imageworks/OpenShadingLanguage/pull/412.patch)
+md5sums=('b828366f056e115b539ee1780883fc7d'
+         'e980ed0a9480958307fa048544154887'
+         'd21cab675ce13c9f0640e1f6a662d2b9')
 
 build() {
   cd OpenShadingLanguage-Release-$pkgver
 
   # Fails building this file on i686
-  sed -i "/src\/testshade/d" CMakeLists.txt
+  #sed -i "/src\/testshade/d" CMakeLists.txt
 
+  patch -Np1 < $srcdir/412.patch
+  patch -Np1 < $srcdir/163df11a3af32295757cfe008d1ba2b757cc7b7b.patch
+
+
   cd src
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
 
-  cmake \
+  cmake ../.. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLLVM_STATIC=0 \
-    ../..
+    -DCMAKE_CXX_FLAGS="-std=c++11"
   make
 }