Fri Aug 2 01:30:56 PDT 2013

5 files changed, 81 insertions, 66 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/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index b83e7fef9..0961ef11d 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -1,24 +1,26 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _pkgname=mitsuba
+_pkgver=0.4.4
+_pkgrel=4
 _bldname=blender
 _bldver=2.68
-_bldep=10
+_bldep=9
 _addname=$_pkgname-$_bldname
 _adddat=20130320
 _addrev=40
-_addrel=2
+_addrel=3
 _pyver=3.3
 
-# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
+# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
 _addver=0.2.1
 
 pkgname=(
   $_pkgname
   $_bldname-addon-$_pkgname
 )
-pkgver=0.4.4
-pkgrel=3
+pkgver=$_pkgver
+pkgrel=$_pkgrel
 pkgdesc='A physically based renderer'
 arch=(
   mips64el
@@ -32,7 +34,7 @@ depends=(
   collada-dom
   glew
   libxxf86vm
-  openexr
+  openexr-libre
   qt4
   xerces-c
 )
@@ -47,40 +49,43 @@ makedepends=(
   mercurial
   python
 )
-install=$_pkgname.install
 source=(
-  ${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
-  hg+${url}hg/$_addname
-  ${pkgname[1]}.install
+  $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
+  $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2
 )
 sha512sums=(
   66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
-  SKIP SKIP
+  c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e
 )
 
 prepare() {
-  mv $srcdir/${pkgname[1]}.install $startdir
-
   cd $srcdir/$_pkgname-v$pkgver
 
-  [[ -d build ]] && rm -vr build
-  mkdir -v build
+  msg 'renaming wrong OS name'
+  _OS=$(uname -o)
+  [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp
+  [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp
+  sed -i 's|Linux/|Linux,|
+          s|Linux|GNU/Linux|
+         ' include/$_pkgname/core/{atomic,fstream,random,thread}.h
 
-  cd $startdir/../srcdest/$_addname
+  msg 'removing Open Source term'
+  sed -i 's|free-software/open-source|free-software|
+         ' include/$_pkgname/core/quad.h
 
-  msg "${pkgname[1]}"
-  hg update -c -r $_addrev
-  hg log -l 1 -r $_addrev
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 }
 
 build() {
   cd $srcdir/$_pkgname-v$pkgver/build
 
-  [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
+  [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF
+  # i686: MTS_SSE disabled
 
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-    $DMTS_SSE\
     -DBoost_PYTHON_LIBRARY=/usr/lib/libboost_python${_pyver::1}.so\
+    -DMTS_SSE=$_SSE\
     -DPYTHON_INCLUDE_DIR=/usr/include/python${_pyver}m\
     -DPYTHON_LIBRARY=/usr/lib/libpython${_pyver}m.so
   make
@@ -89,8 +94,9 @@ build() {
 package_mitsuba() {
   cd $srcdir/$_pkgname-v$pkgver/build
   make DESTDIR=$pkgdir install
+  install=$_pkgname.install
 
-  #fixing files and folders location
+  msg 'fixing files and folders location'
   a=$pkgdir/usr
   b=$srcdir/$_pkgname-v$pkgver
   install -vd $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}$_pkgname,pixmaps}}
@@ -98,7 +104,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/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
+  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}
   mv -v $a/{sdk/include,}
@@ -110,16 +116,19 @@ package_blender-addon-mitsuba() {
   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
   pkgver=$_addver.r$_addrev.v$_bldver
   pkgrel=$_addrel
   optdepends=
-  install=$pkgname.install
 
-  cd $srcdir/$_addname
+  cd $srcdir/$_addname-$_addrev
+
+  msg 'fixing binary path'
+  sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'|
+         ' $_pkgname/properties/engine.py
 
   a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
   b=$pkgdir/usr/share/licenses/$pkgname
diff --git a/pcr/mitsuba/blender-addon-mitsuba.install b/pcr/mitsuba/blender-addon-mitsuba.install
deleted file mode 100644
index 41d69870d..000000000
--- a/pcr/mitsuba/blender-addon-mitsuba.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  cat << EOF
-## Please type "/usr/bin" in
-## "Mitsuba Engine Settings" > "Executable path:" option
-## to correct fuction.
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 29e791e75..0951e474d 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -4,12 +4,13 @@
 pkgname='ryzom-hg'
 _hgver=ce26956d3a4a
 pkgver=20130727
-pkgrel=6
+pkgrel=7
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
 depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
+conflicts=('ryzom')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost')
 source=("libre://$pkgname-$pkgver.tar.gz")
 
@@ -40,6 +41,9 @@ package() {
   sed -i 's|"open.ryzom.com:40916";|"shard.ryzom.com:40916";|g' client_default.cfg
   sed -i 's|CreateAccountURL = "";|CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";|g' client_default.cfg
   sed -i 's|InstallWebPage = "";|InstallWebPage = "http://dl.ryzom.com/installer/";|g' client_default.cfg
+  sed -i 's|"http://open.ryzom.com:50000/stats/stats.php";|"http://shard.ryzom.com:50000/stats/stats.php";|g' client_default.cfg
+  sed -i 's|atys.|app.|g' client_default.cfg
+  sed -i 's|"app.ryzom.com" |"api.ryzom.com", "app.ryzom.com" |g' client_default.cfg
 }
 
 mksha256sums=('SKIP')
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