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

8 files changed, 66 insertions, 47 deletions

diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 6ec5ec2f5..d3c891067 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -4,21 +4,21 @@ _srcname=luxrender
 _pkgver=1.2.1
 _bldname=blender
 _bldver=2.68
-_bldep=10
+_bldep=9
 _pkgname=${_srcname::3}${_bldname::5}25
 _srcver=c9deae0646d0
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=2
+pkgrel=3
 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/
 license=GPL
 depends=(
   $_srcname=$_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))"
 )
 provides=($_pkgname=$_pkgver)
 conflicts=$_pkgname
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
index ff25fb014..638d504b7 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr-libre/PKGBUILD
@@ -11,7 +11,8 @@ url="http://www.openexr.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('zlib' 'ilmbase')
-makedepends=('libreoffice-writer' 'jre7-openjdk-headless' 'libcups' 'libxinerama')
+makedepends=('libcups' 'libxinerama')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libreoffice-writer' 'jre7-openjdk-headless')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
@@ -25,6 +26,7 @@ noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFile
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
+  [ "$CARCH" = "mips64el" ] && sed -i 's/ doc //' Makefile.in  # no libreoffice yet
   ./configure --prefix=/usr
   make
 }
@@ -38,14 +40,16 @@ package() {
   # add source documentation with free fonts
   install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc
 
-  # convert documentation to pdf format
-  cd doc
+  if [ "$CARCH" != "mips64el" ]; then
+    # convert documentation to pdf format
+    cd doc
 
-  for x in ${noextract[@]}; do
-    libreoffice --headless --invisible --convert-to pdf ${x}
-  done
+    for x in ${noextract[@]}; do
+      libreoffice --headless --invisible --convert-to pdf ${x}
+    done
 
-  cd ..
+    cd ..
+  fi
 
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
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/culmus-latex/PKGBUILD b/pcr/culmus-latex/PKGBUILD
index 251ba0518..8562f2fb5 100644
--- a/pcr/culmus-latex/PKGBUILD
+++ b/pcr/culmus-latex/PKGBUILD
@@ -1,5 +1,4 @@
-#Contributor (Arch): Dmitry Batenkov <dima dot batenkov at gmail dot 
-com>
+#Contributor (Arch): Dmitry Batenkov <dima dot batenkov at gmail dot com>
 # Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
 # taken from https://aur.archlinux.org/packages/culmus-latex/
 
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/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD
index 1b30f06c2..c17511f47 100644
--- a/pcr/setbfree/PKGBUILD
+++ b/pcr/setbfree/PKGBUILD
@@ -1,10 +1,9 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=setbfree
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="A DSP Tonewheel Organ emulator."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://setbfree.org/"
 license=('GPL')
 depends=('jack' 'liblo' 'tk' 'desktop-file-utils')
@@ -12,7 +11,7 @@ makedepends=('lv2')
 install="$pkgname.install"
 source=("https://github.com/pantherb/setBfree/tarball/v$pkgver"
         "https://raw.github.com/pantherb/setBfree/master/debian/setbfree.desktop")
-md5sums=('7b64947289687cbf71b9e87fdd006f36'
+md5sums=('8b7b077dfb784927c7103948083e1f04'
          '8c2a863562f26856dcff0a456cf36dcf')
 
 build() {
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
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 64778701a..311e554e7 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.07.31
+pkgver=2013.08.02
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
 depends=('python')
 makedepends=('python-distribute')
 source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('879407fed53888aae97a0eda26e693e6'
+md5sums=('772d2bbf3e9bcfc3da05d956cf6d8705'
           'SKIP')
 
 prepare() {