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

1 files changed, 53 insertions, 34 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 435a1b4a7..58e680b02 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,28 +1,37 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-_spacenav=false
-_pkgname=blender-libre
-_pkgflag=libre
-if [ $_spacenav == true ]; then
-  pkgname=blender-spacenav-libre
-  _spndesc=' (with spacenav support)'
-else
-  pkgname=blender-libre
-  _spndesc=''
-fi
+_pkgname=blender
 epoch=8
-pkgver=2.67b
+_pkgver=2.67b
+pkgrel=3
 _jpgver=1.5
 _pyver=3.3
-pkgrel=2
-pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
+
+# Only used if package is unstable.
+_svn=false
+[[ $_svn == true ]] && {
+  pkgrel=1
+  _svnrev=58224
+  _svnver=.r$_svnrev
+  _svndesc=', svn version'
+}
+
+_spn=false
+[[ $_spn == true ]] && {
+  _spnname=-spacenav
+  _spndesc=' (with spacenav support)'
+}
+
+pkgname=$_pkgname$_spnname-libre
+pkgver=$_pkgver$_svnver
+pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_svndesc$_spndesc' (without CYCLES_OSL)'
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 license=GPL
-url=http://www.${_pkgname%-$_pkgflag}.org
+url=http://www.$_pkgname.org
 depends=(
   desktop-file-utils
   ffmpeg
@@ -30,6 +39,7 @@ depends=(
   freetype2
   hicolor-icon-theme
   jack
+  #jemalloc
   libpng
   libtiff
   openal
@@ -41,9 +51,7 @@ depends=(
   shared-mime-info
   xdg-utils
 )
-if [ $_spacenav == true ]; then
-  depends+=(libspnav)
-fi
+[[ $_spn == true ]] && depends+=(libspnav)
 optdepends=(
   'bullet: for Rigid Bodies and Physics Simulation'
   'xcftools: for import GIMP images to scene (pcr repo)'
@@ -54,22 +62,31 @@ makedepends=(
   mesa
   subversion
 )
-provides=(${_pkgname%-$_pkgflag}=$epoch:$pkgver)
-conflicts=${_pkgname%-$_pkgflag}
-replaces=${_pkgname%-$_pkgflag}
+provides=($_pkgname=$epoch:$_pkgver)
+conflicts=$_pkgname
+replaces=$_pkgname
 install=$_pkgname.install
-source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
+source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
 sha512sums=d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525
+[[ $_svn == true ]] && {
+  source=$_pkgname-$pkgver::svn+https://svn.$_pkgname.org/svnroot/bf-$_pkgname/trunk/$_pkgname#revision=$_svnrev
+  sha512sums=SKIP
+}
 
 prepare() {
-  mkdir $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
+  cd $srcdir/$_pkgname-$pkgver
+
+  mkdir -v build
+
+  msg 'Remove nonfree povray render support'
+  rm -vr release/scripts/addons/render_povray
 }
 
 build() {
-  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
-
-  [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
+  cd $srcdir/$_pkgname-$pkgver/build
 
+  [[ $CARCH == x86_64 ]] && _SSE2=ON || _SSE2=OFF
+  [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF
   cmake ..\
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
@@ -78,33 +95,35 @@ build() {
     -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
     -DPYTHON_LIBPATH=/usr/lib\
     -DPYTHON_LIBRARY=python${_pyver}m\
-    -DPYTHON_VERSION=${_pyver}\
-    $DSUPPORT_SSE2_BUILD\
+    -DPYTHON_VERSION=$_pyver\
+    -DSUPPORT_SSE2_BUILD=$_SSE2\
+    -DWITH_BULLET=ON\
     -DWITH_CODEC_FFMPEG=ON\
     -DWITH_CODEC_SNDFILE=ON\
     -DWITH_CYCLES=ON\
     -DWITH_CYCLES_CUDA_BINARIES=OFF\
-    -DWITH_CYCLES_OSL=ON\
+    -DWITH_CYCLES_OSL=OFF\
     -DWITH_FFTW3=ON\
     -DWITH_GAMEENGINE=ON\
     -DWITH_IMAGE_REDCODE=ON\
+    -DWITH_INPUT_NDOF=$_NDOF\
     -DWITH_INSTALL_PORTABLE=OFF\
     -DWITH_JACK=ON\
+    -DWITH_JACK_DYNLOAD=OFF\
+    -DWITH_MEM_JEMALLOC=OFF\
     -DWITH_MOD_OCEANSIM=ON\
     -DWITH_OPENCOLLADA=ON\
     -DWITH_PLAYER=ON\
     -DWITH_PYTHON_INSTALL=OFF\
     -DWITH_SYSTEM_GLEW=ON
-
   make $MAKEFLAGS
   make
 }
 
 package() {
-  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
+  cd $srcdir/$_pkgname-$pkgver/build
   make DESTDIR=$pkgdir install
-  rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray # drop nonfree povray render support
-  python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag} || return 0
+  python -m compileall $pkgdir/usr/share/$_pkgname || return 0
 }
 
 # vim:set ts=2 sw=2 et: