Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

1 files changed, 22 insertions, 27 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index a857ad65b..56fe35e85 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -28,7 +28,7 @@ _pkgver=2.72
 [[ $_git == no  ]] && pkgver=$_pkgver
 [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
 pkgrel=1.parabola1
-epoch=14
+_epoch=14
 _jpgver=1.5
 _llvmver=3.5
 _pyver=3.4
@@ -36,9 +36,9 @@ pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda suppo
 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' 'libspnav' 'libtiff'
-         'openal' 'opencolorio' 'opencollada' 'openexr' 'openimageio'
+depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freeglut' 'freetype2'
+         'glew' 'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libspnav'
+         'libtiff' 'openal' 'opencolorio' 'opencollada' 'openexr' 'openimageio'
          'openshadinglanguage' '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'
@@ -121,8 +121,8 @@ build() {
     -DPYTHON_LIBPATH=/usr/lib \
     -DPYTHON_LIBRARY=python${_pyver}m \
     -DPYTHON_VERSION=$_pyver \
-    -DSUPPORT_SSE_BUILD=ON \
-    -DSUPPORT_SSE2_BUILD=ON \
+    -DSUPPORT_SSE_BUILD=$_SSE \
+    -DSUPPORT_SSE2_BUILD=$_SSE2 \
     -DWITH_AUDASPACE=ON \
     -DWITH_ASSERT_ABORT=OFF \
     -DWITH_BLENDER=ON \
@@ -137,15 +137,13 @@ build() {
     -DWITH_CXX_GUARDEDALLOC=OFF \
     -DWITH_CYCLES=ON \
     -DWITH_CYCLES_CUDA_BINARIES=OFF \
-    -DWITH_CYCLES_DEBUG=OFF \
-    -DWITH_CYCLES_LOGGING=OFF \
     -DWITH_CYCLES_OSL=ON \
     -DWITH_CYCLES_STANDALONE=ON \
     -DWITH_CYCLES_STANDALONE_GUI=ON \
     -DWITH_FFTW3=ON \
     -DWITH_FREESTYLE=ON \
     -DWITH_GAMEENGINE=ON \
-    -DWITH_GCC_MUDFLAP=ON \
+    -DWITH_GCC_MUDFLAP=OFF \
     -DWITH_GHOST_DEBUG=OFF \
     -DWITH_GHOST_SDL=OFF \
     -DWITH_GHOST_XDND=ON \
@@ -167,7 +165,6 @@ build() {
     -DWITH_JACK=ON \
     -DWITH_JACK_DYNLOAD=ON \
     -DWITH_LIBMV=OFF \
-    -DWITH_LIBMV_SCHUR_SPECIALIZATIONS=OFF \
     -DWITH_LLVM=ON \
     -DWITH_LZMA=ON \
     -DWITH_LZO=ON \
@@ -188,7 +185,7 @@ build() {
     -DWITH_PYTHON=ON \
     -DWITH_PYTHON_INSTALL=OFF \
     -DWITH_PYTHON_INSTALL_NUMPY=OFF \
-    -DWITH_PYTHON_INSTALL_REQUESTS=ON \
+    -DWITH_PYTHON_INSTALL_REQUESTS=OFF \
     -DWITH_PYTHON_MODULE=OFF \
     -DWITH_PYTHON_SAFETY=OFF \
     -DWITH_PYTHON_SECURITY=ON \
@@ -204,9 +201,6 @@ build() {
    # for future blender
    #-DWITH_MOD_CLOTH_ELTOPO=ON\
 
-   #-DSUPPORT_SSE_BUILD=$_SSE \
-   #-DSUPPORT_SSE2_BUILD=$_SSE2 \
-
    # Note: Fix for gcc 4.9 :/
    # -DCMAKE_C_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG"
    # -DCMAKE_CXX_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG"
@@ -215,6 +209,8 @@ build() {
 }
 
 package_blender() {
+  epoch=$_epoch
+
   cd $srcdir/$pkgbase-$pkgver/build
 
   make DESTDIR=$pkgdir install
@@ -222,39 +218,38 @@ package_blender() {
   python -O -m compileall $pkgdir/usr/share/$pkgbase
 
   msg 'move io_import_gimp_image_to_scene.py and render_povray to blender-addon-gimp and blender-addon-povray'
+  [[ -d $srcdir/$pkgbase-addon-gimp   ]] && rm -vr $srcdir/$pkgbase-addon-gimp
+  [[ -d $srcdir/$pkgbase-addon-povray ]] && rm -vr $srcdir/$pkgbase-addon-povray
   install -vm755 -d $srcdir/$pkgbase-addon-{gimp,povray}/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
-  install -vm644 $pkgdir/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons/io_import_gimp_image_to_scene.py \
-                 $srcdir/$pkgbase-addon-gimp/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
-  install -vm644 $pkgdir/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons/render_povray \
-                 $srcdir/$pkgbase-addon-povray/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
+  mv -v $pkgdir/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons/io_import_gimp_image_to_scene.py \
+        $srcdir/$pkgbase-addon-gimp/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
+  mv -v $pkgdir/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons/render_povray \
+        $srcdir/$pkgbase-addon-povray/usr/share/$pkgbase/${_pkgver%[a-z]}/scripts/addons
 }
 
 package_blender-addon-gimp() {
   pkgdesc='A addon for the Blender which allows import GIMP 2.6 images (xcf files) to scene (as polygon plane images)'
   arch=('any')
-  depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'xcftools')
+  depends=("$pkgbase>=$_epoch:$_pkgver" "$pkgbase<$_epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'xcftools')
   makedepends=()
   optdepends=('gimp: for edit xcf files')
-  conflicts=("$pkgbase<$epoch:$_pkgver")
+  conflicts=("$pkgbase<$_epoch:$_pkgver")
   replaces=()
-  epoch=
   options=()
   install=
 
-  install -vm644 $srcdir/$pkgbase-addon-gimp/usr $pkgdir
+  mv -v $srcdir/$pkgbase-addon-gimp/usr $pkgdir
 }
 
 package_blender-addon-povray() {
   pkgdesc='A addon for the Blender which allows render with POV-Ray'
-  arch=('any')
-  depends=("$pkgbase>=$epoch:$_pkgver" "$pkgbase<$epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'povray>=3.7')
+  depends=("$pkgbase>=$_epoch:$_pkgver" "$pkgbase<$_epoch:${_pkgver%%.*}.$((${_pkgver#*.}+1))" 'povray>=3.7')
   makedepends=()
   optdepends=()
-  conflicts=("$pkgbase<$epoch:$_pkgver")
+  conflicts=("$pkgbase<$_epoch:$_pkgver")
   replaces=()
-  epoch=
   options=()
   install=
 
-  install -vm644 $srcdir/$pkgbase-addon-povray/usr $pkgdir
+  mv -v $srcdir/$pkgbase-addon-povray/usr $pkgdir
 }