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

1 files changed, 78 insertions, 10 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index cbd87f8b2..556a44a17 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=blender
 epoch=10
 _pkgver=2.69
-pkgrel=3
+pkgrel=4
 _jpgver=1.5
 _pyver=3.3
 
@@ -24,37 +24,54 @@ arch=(
 license=GPL
 url=http://www.$_pkgname.org
 depends=(
+  boost-libs
   desktop-file-utils
   ffmpeg
   fftw
   freetype2
+  glew
   hicolor-icon-theme
   jack
-  #jemalloc
+  libjpeg-turbo
   libpng
+  libsndfile
   libtiff
+  libx11
+  libxext
+  libxi
+  libxml2
+  libxxf86vm
+  llvm-libs
+  mesa-libgl
   openal
-  openexr-libre
-  openimageio
   'opencollada=20131031'
   opencolorio
-  openshadinglanguage
+  openexr
+  openimageio
+  openjpeg
+  'openshadinglanguage=1.3.3'
+  pcre
+  python
+  sdl
   shared-mime-info
   xdg-utils
+  zlib
 )
 [[ $_spn == true ]] && depends+=(libspnav)
 optdepends=(
   'bullet: for Rigid Bodies and Physics Simulation'
+  #'mesa-libcl: for rendering with optional Mesa OpenCL'
+  'povray: for optional renderer with POV-Ray'
   'xcftools: for import GIMP images to scene (pcr repo)'
-  'povray-libre: for optional renderer with POV-Ray'
   'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
   'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
   'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
   'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
 )
 makedepends=(
-  boost
+  boost # for cycles, booleans, audaspace and/or i18n
   cmake
+  llvm
   mesa
 )
 provides=($_pkgname)
@@ -63,7 +80,7 @@ conflicts=($_pkgname)
 [[ $_spn == true ]] && conflicts+=($_pkgname-libre)
 replaces=$_pkgname
 options=(!strip)
-install=$_pkgname-libre.install
+install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
 sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
 
@@ -108,33 +125,84 @@ build() {
   cmake ..\
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
+    -DCYCLES_OSL=/usr\
+    -DLLVM_STATIC=OFF\
+    -DLLVM_VERSION=3.4\
     -DOPENIMAGEIO_ROOT_DIR=/usr\
     -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-$_jpgver\
+    -DOSL_INCLUDES=/usr/include/OSL\
     -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
     -DPYTHON_LIBPATH=/usr/lib\
     -DPYTHON_LIBRARY=python${_pyver}m\
     -DPYTHON_VERSION=$_pyver\
     -DSUPPORT_SSE_BUILD=$_SSE\
     -DSUPPORT_SSE2_BUILD=$_SSE2\
+    -DWITH_AUDASPACE=ON\
+    -DWITH_BLENDER=ON\
+    -DWITH_BOOST=ON\
+    -DWITH_BOOST_ICU=OFF\
+    -DWITH_BUILDINFO=ON\
     -DWITH_BULLET=ON\
+    -DWITH_CODEC_AVI=ON\
     -DWITH_CODEC_FFMPEG=ON\
     -DWITH_CODEC_SNDFILE=ON\
+    -DWITH_COMPOSITOR=ON\
     -DWITH_CYCLES=ON\
     -DWITH_CYCLES_CUDA_BINARIES=OFF\
     -DWITH_CYCLES_OSL=ON\
+    -DWITH_CYCLES_STANDALONE=ON\
+    -DWITH_CYCLES_STANDALONE_GUI=ON\
     -DWITH_FFTW3=ON\
+    -DWITH_FREESTYLE=ON\
     -DWITH_GAMEENGINE=ON\
+    -DWITH_GHOST_XDND=ON\
+    -DWITH_IK_ITASC=ON\
+    -DWITH_IK_SOLVER=ON\
+    -DWITH_IMAGE_CINEON=ON\
+    -DWITH_IMAGE_DDS=ON\
+    -DWITH_IMAGE_FRAMESERVER=ON\
+    -DWITH_IMAGE_HDR=ON\
+    -DWITH_IMAGE_OPENEXR=ON\
+    -DWITH_IMAGE_OPENJPEG=ON\
     -DWITH_IMAGE_REDCODE=ON\
+    -DWITH_IMAGE_TIFF=ON\
     -DWITH_INPUT_NDOF=$_NDOF\
     -DWITH_INSTALL_PORTABLE=OFF\
+    -DWITH_INTERNATIONAL=ON\
     -DWITH_JACK=ON\
-    -DWITH_JACK_DYNLOAD=OFF\
+    -DWITH_JACK_DYNLOAD=ON\
+    -DWITH_LIBMV=OFF\
+    -DWITH_LLVM=ON\
+    -DWITH_LZMA=ON\
+    -DWITH_LZO=ON\
     -DWITH_MEM_JEMALLOC=OFF\
+    -DWITH_MEM_VALGRIND=OFF\
+    -DWITH_MOD_BOOLEAN=ON\
+    -DWITH_MOD_FLUID=ON\
     -DWITH_MOD_OCEANSIM=ON\
+    -DWITH_MOD_REMESH=ON\
+    -DWITH_MOD_SMOKE=ON\
+    -DWITH_OPENAL=ON\
+    -DWITH_OPENIMAGEIO=ON\
     -DWITH_OPENCOLLADA=ON\
+    -DWITH_OPENCOLORIO=ON\
+    -DWITH_OPENMP=ON\
     -DWITH_PLAYER=ON\
+    -DWITH_PYTHON=ON\
     -DWITH_PYTHON_INSTALL=OFF\
-    -DWITH_SYSTEM_GLEW=ON
+    -DWITH_PYTHON_INSTALL_NUMPY=OFF\
+    -DWITH_PYTHON_MODULE=OFF\
+    -DWITH_PYTHON_SAFETY=OFF\
+    -DWITH_PYTHON_SECURITY=ON\
+    -DWITH_RAYOPTIMIZATION=ON\
+    -DWITH_SDL=ON\
+    -DWITH_STATIC_LIBS=OFF\
+    -DWITH_SYSTEM_GLEW=ON\
+    -DWITH_SYSTEM_OPENJPEG=ON\
+    -DWITH_X11_XF86VMODE=ON\
+    -DWITH_X11_XINPUT=ON
+   #-DWITH_MOD_CLOTH_ELTOPO=ON\
+   #-DWITH_SYSTEM_BULLET=ON\
   make $MAKEFLAGS
   make
 }