Merge branch 'master' of vparabola:abslibre

9 files changed, 48 insertions, 46 deletions

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index e1625893a..6490637b6 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $
+# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.13
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         'i8042-fix-aliases.patch')
 md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
-         'bd937981937fd3c7a553fc770236e640'
+         '49c182728e5b977daefa5e8b0ca028e0'
          '904835a7af0bc5e88007a94cad7c1d9c'
          'f302c931bd85309da9d9792b4cc96467'
          '44260d2cb1a8b51c119d2ce1f83e457a'
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index b5cf9c753..2322d0c4a 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 204911 2014-01-31 09:59:51Z bluewind $
 # Maintainer:  Joakim Hernberg <jbh@alchemy.lu>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: timbosa <tinny_tim@dodo.com.au>
@@ -9,12 +10,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_releasever=13
-_rtpatchver=rt21
+_releasever=14
+_rtpatchver=rt23
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.14 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -40,8 +41,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         'e2ec796847356b785cb06d0563f3f7d5'
-         '60f4b7018bf88ad0ba887b3a492f6b1a'
+         '93624626751140852d82d83aecfd377d'
+         'f6533223cdae66d91fa3667779419ab1'
          'e40789b1e59136235827a3b3bf40c121'
          'bf542c4038d3e7d0da4c92bac0466198'
          '82496e68851d1960543a07ba51cdb44a'
@@ -56,7 +57,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
          'cec0bb8981936eab2943b2009b7a6fff'
          '88d9cddf9e0050a76ec4674f264fb2a1'
          'cb9016630212ef07b168892fbcfd4e5d'
-         '3ce39522f0d8d1422dc095d2a17a77d6')
+         '1e2d95b87a7ab398527b3aac78ea29c5')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 719c9aa05..ddb9041df 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $
+# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.13
-pkgver=${_basekernel}.6
+pkgver=${_basekernel}.7
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0001-Bluetooth-allocate-static-minor-for-vhci.patch'
         'i8042-fix-aliases.patch')
 md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
-         'bd937981937fd3c7a553fc770236e640'
+         '49c182728e5b977daefa5e8b0ca028e0'
          'be059d4c29dfd9ac55183133938e9242'
          'b7c2805bb287a644c0a303bf7721e534'
          '44260d2cb1a8b51c119d2ce1f83e457a'
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 0bbfcc4c7..5b409413b 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -3,14 +3,14 @@
 _srcname=luxrender
 _pkgver=1.3.1
 _bldname=blender
-_bldver=2.69
-_bldep=10
+_bldver=2.70
+_bldep=11
 _pkgname=${_srcname::3}${_bldname::5}25
 _srcver=ad6536b0dda8
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=2
+pkgrel=1
 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.$_srcname.net/
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 1577c810c..48fb240f3 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=blender
-epoch=10
-_pkgver=2.69
-pkgrel=4
+epoch=11
+_pkgver=2.70
+pkgrel=1
 _jpgver=1.5
 _pyver=3.3
 
@@ -44,12 +44,12 @@ depends=(
   llvm-libs
   mesa-libgl
   openal
-  'opencollada=20131031'
+  'opencollada=20140214'
   opencolorio
   openexr
   openimageio
   openjpeg
-  'openshadinglanguage=1.3.3'
+  'openshadinglanguage=1.4.1'
   pcre
   python
   sdl
@@ -82,7 +82,7 @@ replaces=$_pkgname
 options=(!strip)
 install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
+sha512sums=5c5d3aa418b88eb55d25a28967edc9ff51b4f9337e15d662db8f4e23eea0772f31a256a7effdd1ffecf0636a300b821a7c53dd1c8b46311b572b412b758224af
 
 prepare() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index ef8344dce..0c533759a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 207134 2014-03-07 14:06:45Z thomas $
+# $Id: PKGBUILD 208677 2014-03-24 21:47:07Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.13
-_sublevel=6
+_sublevel=7
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
@@ -41,7 +41,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'i8042-fix-aliases.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
-         'bd937981937fd3c7a553fc770236e640'
+         '49c182728e5b977daefa5e8b0ca028e0'
          'b6a3a3f9cac1be38384241ad58d45d46'
          '3740951ae165b89a2139d45ae7d82173'
          'e49ac236dfeef709f91a3d993ea7b62c'
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() {