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

5 files changed, 38 insertions, 11 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2788e21d9..6e3228359 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,8 +4,7 @@
 _pkgname=blender
 pkgname=blender-libre
 pkgver=2.63a
-pkgrel=4
-epoch=4
+pkgrel=5
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
new file mode 100644
index 000000000..d9934e179
--- /dev/null
+++ b/libre/luxblend25/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+pkgname=luxblend25
+pkgver=1.0rc3
+_pkgver=2d621c653196
+_blender=2.63
+pkgrel=1
+pkgdesc="A LuxRender exporter for Blender-libre"
+arch=('any')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('blender' 'luxrender')
+replaces=('luxblend25')
+conflicts=('luxblend25')
+provides=("luxblend25=$pkgver")
+source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2)
+md5sums=('c5719c2a0e8567cd9f0aef429a2996f0')
+
+package() {
+  install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  cp -a "$srcdir"/luxrender-luxblend25-$_pkgver/src/luxrender \
+    "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  # change the search path in exporter so it finds pylux in its new location
+  sed -i 's|from.*import pylux|import pylux|' "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender/outputs/pure_api.py"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index c8ea75082..279e6622e 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 _pkgname=luxrays
 pkgname=luxrays-libre
-pkgver=1.0rc2
-_pkgver=8707be9e6dc9
-pkgrel=2
+pkgver=1.0rc3
+_pkgver=eb749c000ffc
+pkgrel=1
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ replaces=('luxrays')
 conflicts=('luxrays')
 provides=("luxrays=$pkgver")
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('b4f31563a8235a2791ab9df58be43adb')
+md5sums=('f5f4b53df22a1c7ad301c78d046edd7d')
 
 build() {
   cd "$srcdir/luxrender-$_pkgname-$_pkgver"
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 122a87207..be6fd88e8 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 pkgname=luxrender-libre
-pkgver=1.0rc2
-_pkgver=008805644181
-pkgrel=3
+pkgver=1.0rc3
+_pkgver=9ed6b94cef05
+pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
@@ -20,7 +20,7 @@ conflicts=('luxrender')
 provides=("luxrender=$pkgver")
 source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
         boost_1.50_fix.diff)
-md5sums=('1922ccce6f70e7d707b340e2415875cd'
+md5sums=('54ff625a7833541c3cff5f0a77a93863'
          '8c7774bb0c97aadd77d9e665d8fa4aab')
 
 build() {
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
index 9c29caf0b..a921253da 100644
--- a/libre/parabola-themes-slim/PKGBUILD
+++ b/libre/parabola-themes-slim/PKGBUILD
@@ -6,7 +6,7 @@ replaces=('archlinux-themes-slim')
 conflicts=('archlinux-themes-slim')
 pkgname=parabola-themes-slim
 pkgver=1.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="a theme parabolero to the Slim login manager"
 arch=('any')
 url="https://parabolagnulinux.org/"