Merge branch 'master' of vparabola:abslibre

3 files changed, 23 insertions, 22 deletions

diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
index e1cd0fef6..d1115a448 100644
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 
 _pkgname=ogre
 pkgname=$_bldname-addon-$_pkgname
 pkgver=0.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)"
 arch=any
 url=https://code.google.com/p/${_bldname}2$_pkgname
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 600ddd7f1..3b3496ab6 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=mitsuba
-_pkgver=0.4.4
-_pkgrel=5.1
+_pkgver=0.5.0
+_pkgrel=1
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 _addname=$_pkgname-$_bldname
-_adddat=20130320
-_addrev=47
+_adddat=20140325
+_addrev=55
 _addrel=1
 _pyver=3.3
 
-# Thu May 09 22:07:37 2013 +0200 - rev:47:8689e0896cf6 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
-_addver=0.2.1
+# Tue Mar 25 02:35:10 2014 +0100 - rev:55:2e925643723b ($srcdir/$_addname/mtsblend/__init__.py:bl_info>version)
+_addver=0.3.0
 
 pkgname=(
   $_pkgname
@@ -54,8 +54,8 @@ source=(
   $_addname-$_addver-$_addrev.tar.bz2::${url}repos/exporters/$_addname/archive/$_addrev.tar.bz2
 )
 sha512sums=(
-  01967fb84884fbab0ada3775c8f8c54b5523a97ebc9dedd559da3cb54543ecc919d3251c09718358405c19133218048fdb1c64f83d0637cf7b98acccb7564a1c
-  514cbb1300229599c536183ec300c3074aca349e0ddaa36ae7ae868a2c6b466116d9373a8d9ea89dcd1d09685e9a97bbd5c11121860da1a1bf45b921bcd21ca7
+  cb30ca95ada36bec56aca3af55af19511ae64f05631d3e221308dee6fe04a1de08daab6e89c9025c8f6492731ed586d40d92f2168c5d49a060f31cd0afc7d0a7
+  d8b1b1fb33e94f6acc843fabec7479b0f1cb186b37e20e0bf176c0b7e9562b0f7fda5b14f870160dd370ccfdce37c1912817825ec1b3783624c05f23acdcf7ed
 )
 
 prepare() {
@@ -108,6 +108,7 @@ package_mitsuba() {
   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/{m{itsuba,ts{gui,srv,util}},bin}
   mv -v $a/lib{$pkgname-{bidir,core,hw,render}.so,}
   mv -v $a/{{data,plugins},share/$_pkgname}
   mv -v $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
@@ -132,13 +133,13 @@ package_blender-addon-mitsuba() {
 
   msg 'fixing binary path'
   sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'|
-         ' $_pkgname/properties/engine.py
+         ' mtsblend/properties/engine.py
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
   c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
-  install -vd $a && cp -a $_pkgname $a
+  install -vd $a && cp -a mtsblend $a/$_pkgname
   install -vd $b && install -m644 $c $b/LICENSE
 }
 
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index a0eaffa3b..2dfd4ccea 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -2,21 +2,21 @@
 
 _pkgname=yafaray
 _pkgver=1.5
-_pkgrel=1.1
+_pkgrel=2
 _pkgdate=20130921
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 _gitname=Core
 _addname=${_bldname^}-Exporter
 _addrel=1
-_adddate=20130918
+_adddate=20131119
 _pyver=3.3
 
 # Sat Sep 21 00:41:17 2013 -0700 - Merge pull request #70 from YafaRay/bidirectional_cleanup
 _srcver=caef0fc92078871a5dcd2b9f547d954eca2941f1
-# Fri Oct 18 19:07:53 2013 +0200 - Fix AO issue (wizofboz): -Fixed error of indentation in 'yaf_integrator.py' causer of the error in the use of Ambient Occlusion.
-_addver=1874704e44c57bcea478d652563639e79b00a766
+# Tue Nov 19 20:56:44 2013 +0100 - Delete unused presets item
+_addver=f6b0cd3d43177bd36f7580f904cec55bad0b3348
 
 pkgname=(
   $_pkgname
@@ -56,7 +56,7 @@ source=(
 )
 sha512sums=(
   0470e26e2c7956f2d2dc18888cffaf7c2916df42c8208d6e0f4e1d5c438660dd6ae99a1e5f06a118175a8b2a97c89e482b1b069ced2abf3916bbfc60fac54e75
-  3c2207dbca7a70ba82ea6d835785401a24c7813d65380bf8c46a527fff6e65a0a7c101b60b5e8b88163ab07d3d42ec9f9aacbcf090f73062d3643c1c314c97d8
+  a64dedad93cab0f82b7f7234140a7d83dc59d0f76905db7b95bbf2a96bbaf038f50739ec2352961903e1e22ee67a6f5c9d651fa25edbabaf14de906bdfe70d73
 )
 
 prepare() {