mitsuba: rebuilding pkg

1 files changed, 33 insertions, 31 deletions

diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index f2d7f83b0..e0d8e24fd 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -1,25 +1,28 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=(
-  mitsuba
-  blender-addon-mitsuba
-)
-_pkgname=${pkgname[0]}
-_bldname=${pkgname[1]::7}
+_pkgname=mitsuba
+_bldname=blender
 _addname=$_pkgname-$_bldname
-pkgver=0.4.4
 _bldver=2.67
-_addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
 _adddat=20130320
 _addrev=40
 _bldep=8
 _pyver=3.3
+
+# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
+_addver=0.2.1
+
+pkgname=(
+  $_pkgname
+  $_bldname-addon-$_pkgname
+)
+pkgver=0.4.4
 pkgrel=3
 pkgdesc='A physically based renderer'
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 url=https://www.$_pkgname-renderer.org/
 license=GPL3
@@ -59,8 +62,8 @@ prepare() {
 
   cd $srcdir/$_pkgname-v$pkgver
 
-  [[ -d build ]] && rm -r build
-  mkdir build
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 
   cd $startdir/../srcdest/$_addname
 
@@ -74,44 +77,43 @@ build() {
 
   [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
 
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     $DMTS_SSE\
     -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
     -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
     -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
-  setarch $CARCH make
+  make
 }
 
 package_mitsuba() {
   cd $srcdir/$_pkgname-v$pkgver/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 
   #fixing files and folders location
   a=$pkgdir/usr
   b=$srcdir/$_pkgname-v$pkgver
-  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
-  install -m644 $b/data/linux/$_pkgname.desktop           $a/share/applications
-  install -m644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
-  install -m644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
-  mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
-  mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
-  mv $a/{{data,plugins},share/$_pkgname}
-  mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
-  mv $a/{sdk/include,}
-  rmdir $a/{python,sdk}
+  install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
+  install -vm644 $b/data/linux/$_pkgname.desktop           $a/share/applications
+  install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
+  install -vm644 $b/doc/license.txt                        $a/share/licenses/$_pkgname/LICENSE
+  mv -v $a/{m{itsuba,ts{gui,import,srv,util}},bin}
+  mv -v $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
+  mv -v $a/{{data,plugins},share/$_pkgname}
+  mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
+  mv -v $a/{sdk/include,}
+  rmdir -v $a/{python,sdk}
 }
 
 package_blender-addon-mitsuba() {
-  _pkgname=${pkgname:14}
-  _pkgver=$pkgver
-  pkgver=$_addver.r$_addrev.v$_bldver
   pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname-libre package)"
   arch=any
   depends=(
-    $_pkgname=$_pkgver
+    $_pkgname=$pkgver
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
+  _pkgver=$pkgver
+  pkgver=$_addver.r$_addrev.v$_bldver
   optdepends=
   install=$pkgname.install
 
@@ -121,8 +123,8 @@ package_blender-addon-mitsuba() {
   b=$pkgdir/usr/share/licenses/$pkgname
   c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
-  install -d $a && cp -a $_pkgname $a
-  install -d $b && install -m644 $c $b/LICENSE
+  install -vd $a && cp -a $_pkgname $a
+  install -vd $b && install -m644 $c $b/LICENSE
 }
 
 # vim:set ts=2 sw=2 et: