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

12 files changed, 20 insertions, 216 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index db5c6f0ad..0279d6381 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=blender
 pkgname=blender
 pkgver=2.71
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 epoch=14
 _jpgver=1.5
 _pyver=3.4
@@ -15,9 +15,10 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.$pkgbase.org"
 depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freetype2' 'glew'
-         'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libtiff' 'llvm-libs'
-         'openal' 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio'
-         'openshadinglanguage=1.4.2' 'python' 'shared-mime-info' 'xdg-utils')
+         'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libspnav' 'libtiff'
+         'llvm-libs' 'openal' 'opencolorio' 'opencollada=20140214' 'openexr'
+         'openimageio' 'openshadinglanguage=1.4.2' 'python' 'shared-mime-info'
+         'xdg-utils')
 makedepends=('boost' 'cmake' 'git' 'llvm') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
 optdepends=('bullet: for Rigid Bodies and Physics Simulation'
            #'mesa-libcl: for rendering with optional Mesa OpenCL'
@@ -117,7 +118,7 @@ build() {
     -DWITH_IMAGE_OPENJPEG=ON \
     -DWITH_IMAGE_REDCODE=ON \
     -DWITH_IMAGE_TIFF=ON \
-    -DWITH_INPUT_NDOF=OFF \
+    -DWITH_INPUT_NDOF=ON \
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_INTERNATIONAL=ON \
     -DWITH_JACK=ON \
diff --git a/pcr/libspnav/Makefile.in.diff b/pcr/libspnav/Makefile.in.diff
deleted file mode 100644
index 4c93b9cb6..000000000
--- a/pcr/libspnav/Makefile.in.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	2009-04-18 00:12:45.000000000 +0200
-+++ Makefile.in	2009-04-18 00:16:06.000000000 +0200
-@@ -4,6 +4,7 @@
- lib_a = libspnav.a
- soname = libspnav.so.0
- lib_so = $(soname).1
-+linkname = libspnav.so
- 
- CC = gcc
- AR = ar
-@@ -34,6 +35,8 @@
- install: $(lib_a) $(lib_so)
- 	cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a)
- 	cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so)
-+	ln -s $(lib_so) $(linkname)
-+	cp -d $(linkname) $(PREFIX)/$(libdir)/$(linkname)
- 	for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done
- 
- .PHONY: uninstall
diff --git a/pcr/libspnav/PKGBUILD b/pcr/libspnav/PKGBUILD
deleted file mode 100644
index bb670ae99..000000000
--- a/pcr/libspnav/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor (Arch): Jan Hambrecht <jaham at gmx dot net>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-
-pkgname=libspnav
-pkgver=0.2.2
-pkgrel=3
-pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://spacenav.sourceforge.net/"
-license=('GPL')
-depends=('libx11')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz Makefile.in.diff)
-md5sums=('b85a0f4ab711e2d4f73a40e2e371f5ae'
-         'f9122ad4ca823e45bfa0538187df6270')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p0 < $srcdir/Makefile.in.diff
-  ./configure --prefix=$pkgdir/usr --disable-debug
-  make || return 1
-  install -d $pkgdir/usr/lib
-  install -d $pkgdir/usr/include
-  make DESTDIR=$pkgdir install || return 1
-}
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 52cd725f6..c0116cd21 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -19,7 +19,7 @@ _addname=$_bldname-addon-$_pkgname
 _addver=0.3.0 # __init__.py:bl_info>version
 _adddat=20140722
 _addrev=61
-_addrel=2
+_addrel=4
 _pyver=3.4
 
 pkgbase=$_pkgname
@@ -40,9 +40,9 @@ url="https://www.$_pkgname-renderer.org"
 
 _prepare_mitsuba() {
   msg 'Renaming source dir'
-  mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$pkgver.$_pkgrev
+  mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-$_pkgver.$_pkgrev
 
-  cd $srcdir/$_pkgname-$pkgver.$_pkgrev
+  cd $srcdir/$_pkgname-$_pkgver.$_pkgrev
 
   msg 'renaming wrong OS name'
   _OS=$(uname -o)
@@ -72,7 +72,7 @@ prepare() {
 }
 
 _build_mitsuba() {
-  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
+  cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build
 
   [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF
   # i686: MTS_SSE disabled
@@ -93,16 +93,16 @@ package_mitsuba() {
               "$_addname: ${_bldname^} addon exporter and renderer")
   install="$_pkgname.install"
 
-  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/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
+  install -vd $b && install -m644 ../doc/license.txt $b/GPL-v3.0
 
   msg 'fixing files and folders location'
   a=$pkgdir/usr
-  b=$srcdir/$_pkgname-v$pkgver
+  b=$srcdir/$_pkgname-$_pkgver.$_pkgrev
   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
@@ -120,7 +120,7 @@ package_blender-addon-mitsuba() {
   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))")
+  depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).$((${_pkgver:4}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))")
   makedepends=()
 
   cd $srcdir/$_addname-$_addver.$_addrev
diff --git a/pcr/sltv/PKGBUILD b/pcr/sltv/PKGBUILD
deleted file mode 100644
index 74ebb6c26..000000000
--- a/pcr/sltv/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer (Arch): farid abdelnour <farid at archlinux-br.org>
-# Contributor (Arch): SpepS <dreamspepser at yahoo dot it>
-# Contributor (Arch): Wille Marcel <wille at wille.blog.br>
- 
-pkgname=sltv
-pkgver=0.91
-pkgrel=1
-pkgdesc="An audio and video streamer that receives streams from several sources (V4L2, Firewire, ALSA, Pulseaudio, files...) and sends a stream using Icecast or to files (Vorbis+Theora)."
-arch=('any')
-url="http://sltv.holoscopio.com"
-license=('GPL')
-depends=('pygtk' 'python2-configobj' 'gstreamer0.10-python' 'gstreamer-hplugins' 'gstreamer0.10-bad' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg' 'python2' 'gstreamer0.10' 'gstreamer0.10-base' )
-install="$pkgname.install"
-source=("http://sltv.holoscopio.com/$pkgname-$pkgver.tar.gz")
-md5sums=(b5f9b2d7102ca0a4068ebe1783699764)
- 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  # Python2 fix
-  sed -i "s#python#python2#" src/sltv.in
- 
-  ./configure --prefix=/usr
-  make
-}
- 
-package() {
- 
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/sltv/PKGBUILD.new b/pcr/sltv/PKGBUILD.new
deleted file mode 100644
index 2a8344c61..000000000
--- a/pcr/sltv/PKGBUILD.new
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer (Arch): farid abdelnour <farid at archlinux-br.org>
-# Contributor (Arch): SpepS <dreamspepser at yahoo dot it>
-# Contributor (Arch): Wille Marcel <wille at wille.blog.br>
- 
-pkgname=sltv
-pkgver=0.92
-pkgrel=1
-pkgdesc="An audio and video streamer that receives streams from several sources (V4L2, Firewire, ALSA, Pulseaudio, files...) and sends a stream using Icecast or to files (Vorbis+Theora)."
-arch=('any')
-url="http://sltv.holoscopio.com"
-license=('GPL')
-depends=('pygtk' 'python2-configobj' 'gstreamer0.10-python' 'gstreamer-hplugins' 'gstreamer0.10-bad' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg' 'python2' 'gstreamer0.10' 'gstreamer0.10-base' )
-install="$pkgname.install"
-source=("http://sltv.holoscopio.com/$pkgname-$pkgver.tar.gz")
-md5sums=(a1dc9a09b29b817e74f87d673aff2310)
- 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  # Python2 fix
-  sed -i "s#python#python2#" src/landell.in
- 
-  ./configure --prefix=/usr
-  make
-}
- 
-package() {
- 
-  cd "$srcdir/$pkgname-$pkgver"
- 
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/sltv/sltv.install b/pcr/sltv/sltv.install
deleted file mode 100644
index 16b4ff953..000000000
--- a/pcr/sltv/sltv.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
- 
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
deleted file mode 100644
index e911dd326..000000000
--- a/pcr/spacenav-daemon/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-
-pkgname=spacenav-daemon
-_pkgname=${pkgname%-daemon}
-pkgver=0.5
-pkgrel=3
-pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices."
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-conflicts=(${_pkgname}d)
-replaces=(${_pkgname}d)
-url=http://$_pkgname.sourceforge.net/
-license=GPL2
-depends=libx11
-backup=etc/spnavrc
-source=(
-  http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz
-  $_pkgname.service
-  spnavrc
-)
-sha512sums=(
-  908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
-  61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160
-  f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728
-)
-
-build() {
-  cd $srcdir/${_pkgname}d-$pkgver
-  ./configure --prefix=$pkgdir/usr
-  make
-}
-
-package() {
-  cd $srcdir/${_pkgname}d-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service
-  install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/spacenav-daemon/spacenav.service b/pcr/spacenav-daemon/spacenav.service
deleted file mode 100644
index 30e8019e9..000000000
--- a/pcr/spacenav-daemon/spacenav.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Spacenavigator Daemon Service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/spacenavd
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc
deleted file mode 100644
index 7d19ae03b..000000000
--- a/pcr/spacenav-daemon/spnavrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# sensitivity is multiplied with every motion (1.0 normal).
-sensitivity = 1.000
-
-# dead zone; any motion less than this number, is discarded as noise.
-dead-zone = 2
-
-# disable led
-led = 0
diff --git a/pcr/spnavcfg/PKGBUILD b/pcr/spnavcfg/PKGBUILD
deleted file mode 100644
index 92186fd64..000000000
--- a/pcr/spnavcfg/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor (Arch): Jan Hambrecht <jaham at gmx dot net>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-
-pkgname=spnavcfg
-pkgver=0.2.1
-pkgrel=1
-pkgdesc='A libre version of 3Dconnexion'\''s 3D input device drivers configuration'
-arch=(i686 x86_64 mips64el)
-url=http://spacenav.sourceforge.net/
-license=(GPL)
-depends=(gtk2)
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz)
-sha512sums=(8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i -e 's/$(LDFLAGS)/$(LDFLAGS) -lX11/' Makefile.in
-  ./configure --prefix=$pkgdir/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-}
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index 0d241bcbc..71674f2ac 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -19,7 +19,7 @@ _addname=$_bldname-addon-$_pkgname
 _addver=$_pkgver # __init__.py:bl_info>version
 _adddat=20140425
 _addrev=c3d4ff74593d5bd9552306f597f6b36e342687da
-_addrel=1
+_addrel=2
 _pyver=3.4
 
 pkgbase=$_pkgname
@@ -38,9 +38,9 @@ url="http://www.$_pkgname.org"
 
 _prepare_yafaray() {
   msg 'Renaming source dir'
-  mv -v $srcdir/Core-$_pkgrev $srcdir/$_pkgname-$pkgver.$_pkgrev
+  mv -v $srcdir/Core-$_pkgrev $srcdir/$_pkgname-$_pkgver.$_pkgrev
 
-  cd $srcdir/$_pkgname-$pkgver.$_pkgrev
+  cd $srcdir/$_pkgname-$_pkgver.$_pkgrev
 
   [[ -d build ]] && rm -vr build
   mkdir -v build
@@ -63,7 +63,7 @@ prepare() {
 }
 
 _build_yafaray() {
-  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
+  cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build
 
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
@@ -79,7 +79,7 @@ package_yafaray() {
               'qt4: QT GUI'
               "$_addname: ${_bldname^} addon renderer")
 
-  cd $srcdir/$_pkgname-$pkgver.$_pkgrev/build
+  cd $srcdir/$_pkgname-$_pkgver.$_pkgrev/build
   make DESTDIR=$pkgdir install
 
   b=$pkgdir/usr/share/licenses/$pkgname
@@ -93,7 +93,7 @@ package_blender-addon-yafaray() {
   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))")
+  depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver::1}.$((${_pkgver:2:1}+1)).$((${_pkgver:4}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver::1}.$((${_bldver:2}+1))")
   makedepends=()
 
   cd $srcdir/$_addname-$_addver.$_addrev