Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 23 insertions, 21 deletions

diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 040eeccf4..fad4692b2 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,35 +1,37 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=blender-addon-luxrender
-_pkgname=${pkgname:14:3}${pkgname::5}25
+_srcname=luxrender
+_pkgver=1.2.1
+_bldname=blender
+_bldver=2.68
+_bldep=9
+_pkgname=${_srcname::3}${_bldname::5}25
 _srcver=c9deae0646d0
-pkgver=1.2.1.v2.67
-_pkgver=${pkgver::5}
-_reqname=${pkgname::7}
-_reqver=${pkgver:7}
-_reqep=8
+
+pkgname=$_bldname-addon-$_srcname
+pkgver=$_pkgver.v$_bldver
 pkgrel=1
-pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)"
+pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
 arch=any
-url=http://www.${pkgname:14}.net/
+url=http://www.$_srcname.net/
 license=GPL
 depends=(
-  ${pkgname:14}=$_pkgver
-  "$_reqname>=$(($_reqep-1)):$_reqver"
-  "$_reqname<$_reqep:${_reqver::2}$((${_reqver:2:4}+1))"
+  $_srcname=$_pkgver
+  "$_bldname>=$(($_bldep-1)):$_bldver"
+  "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
 )
 provides=($_pkgname=$_pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
-source=http://src.${pkgname:14}.net/$_pkgname/archive/$_srcver.tar.bz2
+source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2
 sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92
 
 package() {
-  a=$srcdir/$_pkgname-$_srcver/src/${pkgname:14}
-  b=$pkgdir/usr/share/$_reqname/$_reqver/scripts/addons
+  a=$srcdir/$_pkgname-$_srcver/src/$_srcname
+  b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   install -d -m755 $b && cp -a $a $b
   # change the search path in exporter so it finds pylux in its new location
-  sed -i 's|from.*import pylux|import pylux|' $b/${pkgname:14}/outputs/pure_api.py
+  sed -i 's|from.*import pylux|import pylux|' $b/$_srcname/outputs/pure_api.py
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 58e680b02..ba061c681 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=blender
 epoch=8
-_pkgver=2.67b
-pkgrel=3
+_pkgver=2.68
+pkgrel=1
 _jpgver=1.5
 _pyver=3.3
 
@@ -24,7 +24,7 @@ _spn=false
 
 pkgname=$_pkgname$_spnname-libre
 pkgver=$_pkgver$_svnver
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_svndesc$_spndesc' (without CYCLES_OSL)'
+pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_svndesc$_spndesc
 arch=(
   mips64el
   x86_64
@@ -67,7 +67,7 @@ conflicts=$_pkgname
 replaces=$_pkgname
 install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525
+sha512sums=b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf
 [[ $_svn == true ]] && {
   source=$_pkgname-$pkgver::svn+https://svn.$_pkgname.org/svnroot/bf-$_pkgname/trunk/$_pkgname#revision=$_svnrev
   sha512sums=SKIP
@@ -102,7 +102,7 @@ build() {
     -DWITH_CODEC_SNDFILE=ON\
     -DWITH_CYCLES=ON\
     -DWITH_CYCLES_CUDA_BINARIES=OFF\
-    -DWITH_CYCLES_OSL=OFF\
+    -DWITH_CYCLES_OSL=ON\
     -DWITH_FFTW3=ON\
     -DWITH_GAMEENGINE=ON\
     -DWITH_IMAGE_REDCODE=ON\