merging changes

2 files changed, 40 insertions, 27 deletions

diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
index 77ae390f6..4baf8ca39 100644
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -2,23 +2,28 @@
 
 _bldname=blender
 _bldver=2.68
-_bldep=10
+_bldep=9
 
 _pkgname=ogre
 pkgname=$_bldname-addon-$_pkgname
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 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
 license=LGPL2.1
 depends=(
-  "$_bldname-libre>=$(($_bldep-1)):$_bldver"
-  "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
+  "$_bldname-libre>=$_bldep:$_bldver"
+  "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
 )
 source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip
 sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712
 
+prepare() {
+  msg 'renaming wrong OS name'
+  sed -i 's|Linux|GNU/Linux|' io_export_${_pkgname}DotScene.py
+}
+
 package() {
   cd $srcdir
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index e42a63269..458181279 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,27 +1,30 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _pkgname=yafaray
+_pkgver=1.5
+_pkgrel=3
 _pkgdate=20130510
 _bldname=blender
 _bldver=2.68
-_bldep=10
+_bldep=9
 _gitname=Core
 _addname=${_bldname^}-Exporter
-_addrel=2
+_addrel=1
+_adddate=20130623
 _pyver=3.3
 
 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
 _srcver=44323def5b3866ff601fd401ef2160b80ced8141                                  
-# Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
-_addver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169
+# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator
+_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb
 
 pkgname=(
   $_pkgname
   $_bldname-addon-$_pkgname
 )
-pkgver=1.5.$_pkgdate
-pkgrel=2
-pkgdesc='A libre software raytracing engine'
+pkgver=$_pkgver.$_pkgdate
+pkgrel=$_pkgrel
+pkgdesc='A free software raytracing engine'
 arch=(
   mips64el
   x86_64
@@ -33,7 +36,7 @@ depends=(
   freetype2
   libjpeg
   libxml2
-  openexr
+  openexr-libre
 )
 optdepends=(
   'python: Python bindings'
@@ -48,22 +51,30 @@ makedepends=(
   swig
 )
 source=(
-  git://github.com/YafaRay/$_gitname.git
-  git://github.com/YafaRay/$_addname.git
+  $_gitname-$_srcver.tar.gz::https://github.com/YafaRay/$_gitname/archive/$_srcver.tar.gz
+  $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz
+)
+sha512sums=(
+  5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6
+  59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c
 )
-sha512sums=(SKIP SKIP)
 
 prepare() {
-  cd $srcdir/$_gitname
+  cd $srcdir/$_gitname-$_srcver
+
+  msg 'Renaming addon dir'
+  mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname
 
-  git checkout $_srcver
+  msg 'renaming wrong OS name'
+  sed -i 's|Linux|GNU/Linux|
+         ' $srcdir/$_pkgname/prop/yaf_scene.py
 
   [[ -d build ]] && rm -vr build
   mkdir -v build
 }
 
 build() {
-  cd $srcdir/$_gitname/build
+  cd $srcdir/$_gitname-$_srcver/build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
@@ -71,7 +82,7 @@ build() {
 }
 
 package_yafaray() {
-  cd $srcdir/$_gitname/build
+  cd $srcdir/$_gitname-$_srcver/build
   make DESTDIR=$pkgdir install
 }
 
@@ -80,22 +91,19 @@ package_blender-addon-yafaray() {
   arch=any
   depends=(
     $_pkgname=$pkgver
-    "$_bldname>=$(($_bldep-1)):$_bldver"
-    "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
+    "$_bldname-libre>=$_bldep:$_bldver"
+    "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
   )
-  pkgver=$pkgver.v$_bldver
+  pkgver=$_pkgver.$_adddate.v$_bldver
   pkgrel=$_addrel
   optdepends=
 
-  cd $srcdir/$_addname
+  cd $srcdir
 
   a=/usr/lib
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
-  git checkout $_addver
-  git checkout-index -a -f --prefix=${b%bin}
-
-  install -vd $b
+  install -vd $b && cp -a $_pkgname ${b%$_pkgname/bin}
   ln -vsf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
   ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
   ln -vsf $a/$_pkgname               $b/plugins