Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

2 files changed, 107 insertions, 101 deletions

diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index dda5c4219..52cd725f6 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -9,40 +9,40 @@ _build_add=yes
 
 _pkgname=mitsuba
 _pkgver=0.5.0
-_pkgrel=4
+_pkgdat=20140225
+_pkgrev=2030
+_pkgrel=5
 _bldname=blender
 _bldver=2.71
 _bldep=14
-_addname=$_pkgname-$_bldname
+_addname=$_bldname-addon-$_pkgname
+_addver=0.3.0 # __init__.py:bl_info>version
 _adddat=20140722
 _addrev=61
-_addrel=1
+_addrel=2
 _pyver=3.4
 
-# rev:55 addon ($srcdir/$_addname/mtsblend/__init__.py:bl_info>version)
-_addver=0.3.0
-
 pkgbase=$_pkgname
 [[ $_build_pkg == yes ]] && pkgname+=("$_pkgname")
 [[ $_build_add == yes ]] && pkgname+=("$_bldname-addon-$_pkgname")
-pkgver=$_pkgver
+pkgver=$_pkgver.$_pkgdat
 pkgrel=$_pkgrel
 arch=('i686' 'x86_64' 'mips64el')
-url="https://www.$_pkgname-renderer.org/"
-license=('GPL3')
+url="https://www.$_pkgname-renderer.org"
 [[ $_build_pkg == yes ]] && depends=('boost-libs' 'collada-dom' 'glew' 'libxxf86vm' 'openexr' 'qt4' 'xerces-c')
 [[ $_build_pkg == yes ]] && makedepends=('boost' 'cmake' 'eigen3' 'mercurial' 'python')
-[[ $_build_pkg == yes ]] && source+=("$_pkgname-$pkgver.tar.bz2::${url}repos/$_pkgname/archive/v$pkgver.tar.bz2")
-[[ $_build_add == yes ]] && source+=("$_addname-$_addver-$_addrev.tar.bz2::${url}repos/exporters/$_addname/archive/$_addrev.tar.bz2")
-source+=('http://www.gnu.org/licenses/gpl-3.0.txt')
+[[ $_build_pkg == yes ]] && source+=("$_pkgname-$_pkgver.$_pkgrev.tar.bz2::${url}/repos/$_pkgname/archive/$_pkgrev.tar.bz2")
+[[ $_build_add == yes ]] && source+=("$_addname-$_addver.$_addrev.tar.bz2::${url}/repos/exporters/$_pkgname-$_bldname/archive/$_addrev.tar.bz2"
+                                     'http://www.gnu.org/licenses/gpl-2.0.txt')
 [[ $_build_pkg == yes ]] && sha512sums+=('cb30ca95ada36bec56aca3af55af19511ae64f05631d3e221308dee6fe04a1de08daab6e89c9025c8f6492731ed586d40d92f2168c5d49a060f31cd0afc7d0a7')
-[[ $_build_add == yes ]] && sha512sums+=('cd812c46ccfb4673a5d170c96e4aa8275d136ef4ae300b50944aac69ff646e9118afa78a9a1f22e7b03fcc1e4fa496c889f59d8bf40836e27d023548061a4491')
-sha512sums+=('7633623b66b5e686bb94dd96a7cdb5a7e5ee00e87004fab416a5610d59c62badaf512a2e26e34e2455b7ed6b76690d2cd47464836d7d85d78b51d50f7e933d5c')
+[[ $_build_add == yes ]] && sha512sums+=('cd812c46ccfb4673a5d170c96e4aa8275d136ef4ae300b50944aac69ff646e9118afa78a9a1f22e7b03fcc1e4fa496c889f59d8bf40836e27d023548061a4491'
+                                         'aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957')
 
 _prepare_mitsuba() {
-  mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-v$pkgver
+  msg 'Renaming source dir'
+  mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$pkgver.$_pkgrev
 
-  cd $srcdir/$_pkgname-v$pkgver
+  cd $srcdir/$_pkgname-$pkgver.$_pkgrev
 
   msg 'renaming wrong OS name'
   _OS=$(uname -o)
@@ -62,7 +62,8 @@ _prepare_mitsuba() {
 }
 
 _prepare_blender-addon-mitsuba() {
-  mv -v $srcdir/$_addname-???????????? $srcdir/$_addname-$_addrev
+  msg 'Renaming addon dir'
+  mv -v $srcdir/$_pkgname-$_bldname-???????????? $srcdir/$_addname-$_addver.$_addrev
 }
 
 prepare() {
@@ -71,7 +72,7 @@ prepare() {
 }
 
 _build_mitsuba() {
-  cd $srcdir/$_pkgname-v$pkgver/build
+  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
 
   [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF
   # i686: MTS_SSE disabled
@@ -87,22 +88,25 @@ _build_mitsuba() {
 
 package_mitsuba() {
   pkgdesc='A physically based renderer'
+  license=('GPL3')
   optdepends=('python: Python bindings'
-              "$_pkgname: ${_bldname^} addon exporter and renderer")
+              "$_addname: ${_bldname^} addon exporter and renderer")
   install="$_pkgname.install"
 
-  cd $srcdir/$_pkgname-v$pkgver/build
+  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
   make DESTDIR=$pkgdir install
 
+  b=$pkgdir/usr/share/licenses/$pkgname
+
+  install -vd $b && install -m644 ../LICENSE $b/GPL-v3.0
+
   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}}
+  install -vd $a/{bin,lib/python$_pyver/lib-dynload,share/{applications,$_pkgname,pixmaps}}
   install -vm644 $b/data/linux/$_pkgname.desktop           $a/share/applications
   install -vm644 $b/src/mtsgui/resources/${_pkgname}48.png $a/share/pixmaps
-  install -vm644 $startdir/gpl-3.0.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}
@@ -111,14 +115,15 @@ package_mitsuba() {
 }
 
 package_blender-addon-mitsuba() {
-  pkgver=$_addver.r$_addrev.v$_bldver
+  pkgver=$_addver.$_addrev.v$_bldver
   pkgrel=$_addrel
   pkgdesc="A addon for the ${_bldname^} which allows render and export with Mitsuba (built for the $_bldname package)"
   arch=('any')
+  license=('GPL2')
   depends=("$_pkgname=$_pkgver" "$_bldname-libre>=$_bldep:$_bldver" "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))")
   makedepends=()
 
-  cd $srcdir/$_addname-$_addrev
+  cd $srcdir/$_addname-$_addver.$_addrev
 
   msg 'fixing binary path'
   sed -i 's|'"'default'"': efutil.find_config_value('"'mitsuba', 'defaults', 'binary_path', ''"')|'"'default'"': '"'/usr/bin'"'|
@@ -128,7 +133,7 @@ package_blender-addon-mitsuba() {
   b=$pkgdir/usr/share/licenses/$pkgname
 
   install -vd $a && cp -a mtsblend $a/$_pkgname
-  install -vd $b && install -m644 $startdir/gpl-3.0.txt $b/LICENSE
+  install -vd $b && install -m644 $startdir/gpl-2.0.txt $b/GPL-v2.0
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index 4aa4798fd..0d241bcbc 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,112 +1,113 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
+_build_pkg=yes
+_build_add=yes
+
+[[ $_build_pkg != yes && $_build_pkg != no ]] && _build_pkg=yes
+[[ $_build_add != yes && $_build_add != no ]] && _build_add=yes
+[[ $_build_pkg == no  && $_build_add == no ]] && _build_add=yes
+
 _pkgname=yafaray
-_pkgver=1.5
+_pkgver=0.1.5
+_pkgdat=20140508
+_pkgrev=ff262af4b50a90dcf39da04040b53509d7dc789d
 _pkgrel=1
-_pkgdate=20140508
 _bldname=blender
 _bldver=2.71
-_bldep=12
-_gitname=Core
-_addname=${_bldname^}-Exporter
+_bldep=14
+_addname=$_bldname-addon-$_pkgname
+_addver=$_pkgver # __init__.py:bl_info>version
+_adddat=20140425
+_addrev=c3d4ff74593d5bd9552306f597f6b36e342687da
 _addrel=1
-_adddate=20140425
 _pyver=3.4
 
-# Thu May 8 12:59:36 2014 +0200 - Add support for read 'curve' objects on .xml scene files
-_srcver=ff262af4b50a90dcf39da04040b53509d7dc789d
-# Fri Apr 25 21:43:23 2014 +0200 - Fix progress bar, Now, Blender use same range to YafaRay
-_addver=c3d4ff74593d5bd9552306f597f6b36e342687da
-
-pkgname=(
-  $_pkgname
-  $_bldname-addon-$_pkgname
-)
-pkgver=$_pkgver.$_pkgdate
+pkgbase=$_pkgname
+[[ $_build_pkg == yes ]] && pkgname+=("$_pkgname")
+[[ $_build_add == yes ]] && pkgname+=("$_bldname-addon-$_pkgname")
+pkgver=$_pkgver.$_pkgdat
 pkgrel=$_pkgrel
-pkgdesc='A free software raytracing engine'
-arch=(
-  mips64el
-  x86_64
-  i686
-)
-url=http://www.$_pkgname.org
-license=LGPL2.1
-depends=(
-  freetype2
-  libjpeg
-  libxml2
-  openexr
-)
-optdepends=(
-  'python: Python bindings'
-  'qt4: QT GUI'
-  "${pkgname[1]}: ${_bldname^} addon renderer"
-)
-makedepends=(
-  cmake
-  git
-  python
-  qt4
-  swig
-)
-source=(
-  $_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=(
-  089373ebe702361ccd5a8b8ee789188bdb569338f0f406f2fe5e355ef69d2de5f793a5b9e5f85e998fd0b5a42500124d0d35bffee00d177e710347a1a107228e
-  38b85b14ccf0042012de0e8791ed9264ff389b223ef033f2c9daeccb0388a483c38f9a8aa178819183795ff5dd37c5cdd201f2af23d5e28231bffad7deecd523
-)
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.$_pkgname.org"
+[[ $_build_pkg == yes ]] && depends=('freetype2' 'libjpeg' 'libxml2' 'openexr')
+[[ $_build_pkg == yes ]] && makedepends=('cmake' 'python' 'qt4' 'swig')
+[[ $_build_pkg == yes ]] && source+=("$_pkgname-$_pkgver.$_pkgrev.tar.gz::https://github.com/YafaRay/Core/archive/$_pkgrev.tar.gz")
+[[ $_build_add == yes ]] && source+=("$_addname-$_addver.$_addrev.tar.gz::https://github.com/YafaRay/${_bldname^}-Exporter/archive/$_addrev.tar.gz")
+[[ $_build_pkg == yes ]] && sha512sums+=('089373ebe702361ccd5a8b8ee789188bdb569338f0f406f2fe5e355ef69d2de5f793a5b9e5f85e998fd0b5a42500124d0d35bffee00d177e710347a1a107228e')
+[[ $_build_add == yes ]] && sha512sums+=('38b85b14ccf0042012de0e8791ed9264ff389b223ef033f2c9daeccb0388a483c38f9a8aa178819183795ff5dd37c5cdd201f2af23d5e28231bffad7deecd523')
 
-prepare() {
-  cd $srcdir/$_gitname-$_srcver
+_prepare_yafaray() {
+  msg 'Renaming source dir'
+  mv -v $srcdir/Core-$_pkgrev $srcdir/$_pkgname-$pkgver.$_pkgrev
+
+  cd $srcdir/$_pkgname-$pkgver.$_pkgrev
 
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
+}
+
+_prepare_blender-addon-yafaray() {
   msg 'Renaming addon dir'
-  mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname
+  mv -v $srcdir/${_bldname^}-Exporter-$_addrev $srcdir/$_addname-$_addver.$_addrev
+
+  cd $srcdir/$_addname-$_addver.$_addrev
 
   msg 'renaming wrong OS name'
   sed -i 's|Linux|GNU/Linux|
-         ' $srcdir/$_pkgname/prop/yaf_scene.py
+         ' prop/yaf_scene.py
+}
 
-  [[ -d build ]] && rm -vr build
-  mkdir -v build
+prepare() {
+  [[ $_build_pkg == yes ]] && _prepare_yafaray
+  [[ $_build_add == yes ]] && _prepare_blender-addon-yafaray
 }
 
-build() {
-  cd $srcdir/$_gitname-$_srcver/build
+_build_yafaray() {
+  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
+
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
   make
 }
+[[ $_build_pkg == yes ]] && build() { _build_yafaray; }
 
 package_yafaray() {
-  cd $srcdir/$_gitname-$_srcver/build
+  pkgdesc='A free software raytracing engine'
+  license=('LGPL2.1')
+  optdepends=('python: Python bindings'
+              'qt4: QT GUI'
+              "$_addname: ${_bldname^} addon renderer")
+
+  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
   make DESTDIR=$pkgdir install
+
+  b=$pkgdir/usr/share/licenses/$pkgname
+
+  install -vd $b && install -m644 ../LICENSE $b/LGPL-v2.1
 }
 
 package_blender-addon-yafaray() {
-  pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
-  arch=any
-  depends=(
-    $_pkgname=$pkgver
-    "$_bldname-libre>=$_bldep:$_bldver"
-    "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))"
-  )
-  pkgver=$_pkgver.$_adddate.v$_bldver
+  pkgver=$_addver.$_adddat.v$_bldver
   pkgrel=$_addrel
-  optdepends=
+  pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname package)"
+  arch=('any')
+  license=('GPL2')
+  depends=("$_pkgname=$_pkgver" "$_bldname-libre>=$_bldep:$_bldver" "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))")
+  makedepends=()
+
+  cd $srcdir/$_addname-$_addver.$_addrev
 
-  cd $srcdir
+  a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
+  b=$pkgdir/usr/share/licenses/$pkgname
 
-  a=/usr/lib
-  b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
+  install -vd $a && cp -a ../$_addname-$_addver.$_addrev $a/$_pkgname
+  install -vd $b && install -m644  GPL-license.txt $b/GPL-v2.0
 
-  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
+  install -vd $a/$_pkgname/bin
+  ln -vsf /usr/lib/lib${_pkgname}core.so   $a/$_pkgname/bin/lib${_pkgname}core.so
+  ln -vsf /usr/lib/lib${_pkgname}plugin.so $a/$_pkgname/bin/lib${_pkgname}plugin.so
+  ln -vsf /usr/lib/$_pkgname               $a/$_pkgname/bin/plugins
 }
 
 # vim:set ts=2 sw=2 et: