openshadinglanguage-parabola: update pkg

1 files changed, 29 insertions, 57 deletions

diff --git a/libre/openshadinglanguage-parabola/PKGBUILD b/libre/openshadinglanguage-parabola/PKGBUILD
index fb1ba3264..630a0573c 100644
--- a/libre/openshadinglanguage-parabola/PKGBUILD
+++ b/libre/openshadinglanguage-parabola/PKGBUILD
@@ -1,40 +1,21 @@
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
-# based of Arch pkg
 
-pkgname=openshadinglanguage
-pkgver=1.4.2
+_pkgname=openshadinglanguage
+pkgname=$_pkgname-parabola
+pkgver=1.5.10
 pkgrel=1
-pkgdesc="Advanced shading language for production GI renderers (built for the blender-libre package)"
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-url=https://github.com/imageworks/OpenShadingLanguage
-license=custom
-depends=(
-  openimageio
-  openexr
-  freetype2
-  libpng
-  libtiff
-  boost-libs
-  llvm
-  zlib
-)
-makedepends=(
-  boost
-  clang
-  cmake
-)
-source=(
-  https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
-  llvm-141.patch
-)
-sha512sums=(
-  657ed606622ecd7300479159d205472bd38324a1a3277b9d7c06c3fe4deffb017e42cc9fdac01bf583307f75120f580e89d639fa55fc8d86eca9a33287ff710b
-  597cd4a8d59e03e7cbe0eb9c2f988d81317d9bb0a65c1dc5f5db2fbb3be927b4c9e5342decd1409757787b9354dfdf3aa56fdeadcb8c25308aa5653dc9775ea1
-)
+pkgdesc='Advanced shading language for production GI renderers (built for the blender-parabola package)'
+arch=('i686' 'x86_64' 'mips64el')
+url='https://github.com/imageworks/OpenShadingLanguage'
+license=('custom')
+depends=('boost-libs' 'freetype2' 'libpng' 'libtiff' 'llvm-libs' 'openexr' 'openimageio')
+makedepends=('boost' 'clang' 'cmake')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+source=("https://github.com/imageworks/OpenShadingLanguage/archive/Release-$pkgver.tar.gz")
+md5sums=('b828366f056e115b539ee1780883fc7d')
 
 prepare() {
   cd OpenShadingLanguage-Release-$pkgver
@@ -52,34 +33,25 @@ prepare() {
            ' src/cmake/platform.cmake
     sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i
            ' src/make/detectplatform.mk
-  sed -i 's|Linux/OSX|GNU/BSD|' src/include/export.h
-  
-  # LLVM 3.4 build fix
-  # based of "https://github.com/imageworks/OpenShadingLanguage/pull/320.patch"
-  patch -Np1 < $srcdir/llvm-141.patch
+  sed -i 's|Linux/OSX|GNU/BSD|' src/include/OSL/export.h
+}
+
+build() {
+  cd OpenShadingLanguage-Release-$pkgver
 
-  # fix include paths
-  sed -i 's|oslconfig.h|../include/oslconfig.h|
-          s|dual.h|../include/dual.h|
-          s|dual_vec.h|../include/dual_vec.h|
-         ' src/liboslexec/llvm_ops.cpp
-  sed -i 's|oslexec.h|../include/oslexec.h|
-          s|oslclosure.h|../include/oslclosure.h|
-          s|osl_pvt.h|../include/osl_pvt.h|
-         ' src/liboslexec/oslexec_pvt.h
+  # Fails building this file on i686
+  if [[ $CARCH == i686 ]]; then
+    sed -i "/src\/testshade/d" CMakeLists.txt
+  fi
 
   cd src
 
   [[ -d build ]] && rm -r build
-  mkdir build
-}
-
-build() {
-  cd OpenShadingLanguage-Release-$pkgver/src/build
+  mkdir build && cd build
 
   cmake ../.. \
-    -DCMAKE_BUILD_TYPE=Release\
-    -DCMAKE_INSTALL_PREFIX=/usr\
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
     -DLLVM_STATIC=OFF
   make
 }
@@ -90,11 +62,11 @@ package() {
   make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/usr/share/OSL/
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname
+  mkdir -p $pkgdir/usr/share/licenses/$_pkgname
   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
-  mv $pkgdir/usr/LICENSE                     $pkgdir/usr/share/licenses/$pkgname
+  mv $pkgdir/usr/LICENSE                     $pkgdir/usr/share/licenses/$_pkgname
 }
 
 # vim:set ts=2 sw=2 et: