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

1 files changed, 28 insertions, 30 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 63188c620..0d040f508 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -12,38 +12,38 @@
 # unreasonable.
 
 _git=no
-_gittagver=v2.72
-_gittagrev=b
-# blender:                Tue, 21 Oct 2014 11:57:39 +0000 (17:57 +0600)
-_gitcommit=9e963a
-# blender-addons:         Tue, 21 Oct 2014 19:48:21 +0000 (21:48 +0200)
-_gitaddonscommit=b71475
-# blender-addons-contrib: Tue, 14 Oct 2014 05:32:33 +0000 (16:32 +1100)
-_gitaddonscontribcommit=ea70fe
-# blender-translations:   Mon, 13 Oct 2014 19:43:20 +0000 (21:43 +0200)
-_gittranslationscommit=02219a
+_gittagver=v2.73
+_gittagrev=
+# blender:                Tue, 20 Jan 2015 12:16:03 +0000 (23:16 +1100)
+_gitcommit=58e5509d
+# blender-addons:         Mon, 19 Jan 2015 15:38:39 +0000 (16:38 +0100)
+_gitaddonscommit=659fec7c
+# blender-addons-contrib: Sat, 17 Jan 2015 09:41:03 +0000 (10:41 +0100)
+_gitaddonscontribcommit=a8fe7f10
+# blender-translations:   Tue, 13 Jan 2015 20:27:35 +0000 (21:27 +0100)
+_gittranslationscommit=47771dc8
 
 pkgbase=blender
 pkgname=("$pkgbase" "$pkgbase-addon-gimp" "$pkgbase-addon-povray")
-_pkgver=2.72b
+_pkgver=2.73
 _depver=${_pkgver%[a-z]}
 [[ $_git == no  ]] && pkgver=$_pkgver
 [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
-pkgrel=2.parabola1
+pkgrel=1.parabola1
 epoch=15
 _jpgver=1.5
 _llvmver=3.5
 _povver=3.7
 _pyver=3.4
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree CUDA support'
+pkgdesc='A fully integrated 3D graphics creation suite, without nonfree CUDA support'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.$pkgbase.org"
 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)
+         'openshadinglanguage' 'python-requests' 'shared-mime-info' 'xdg-utils')
+makedepends=('boost' 'cmake' 'git') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
 optdepends=('bullet: for Rigid Bodies and Physics Simulation'
             #'opencl-mesa: for rendering with optional Mesa OpenCL'
             'blender-addon-gimp: for import GIMP images to scene'
@@ -111,8 +111,6 @@ build() {
   [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF
   cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" \
-    -DCMAKE_CXX_FLAGS_RELEASE="-fno-delete-null-pointer-checks -DNDEBUG" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCYCLES_OSL=/usr \
     -DLLVM_STATIC=OFF \
@@ -141,15 +139,21 @@ build() {
     -DWITH_CYCLES=ON \
     -DWITH_CYCLES_CUDA_BINARIES=OFF \
     -DWITH_CYCLES_OSL=ON \
-    -DWITH_CYCLES_STANDALONE=ON \
-    -DWITH_CYCLES_STANDALONE_GUI=ON \
+    -DWITH_CYCLES_STANDALONE=OFF \
+    -DWITH_CYCLES_STANDALONE_GUI=OFF \
     -DWITH_FFTW3=ON \
     -DWITH_FREESTYLE=ON \
     -DWITH_GAMEENGINE=ON \
-    -DWITH_GCC_MUDFLAP=OFF \
     -DWITH_GHOST_DEBUG=OFF \
     -DWITH_GHOST_SDL=OFF \
     -DWITH_GHOST_XDND=ON \
+    -DWITH_GL_EGL=OFF \
+    -DWITH_GL_PROFILE_COMPAT=ON \
+    -DWITH_GL_PROFILE_CORE=OFF \
+    -DWITH_GL_PROFILE_ES20=OFF \
+    -DWITH_GLEW_ES=OFF \
+    -DWITH_GLEW_MX=OFF \
+    -DWITH_GLU=ON \
     -DWITH_GTESTS=OFF \
     -DWITH_HEADLESS=OFF \
     -DWITH_IK_ITASC=ON \
@@ -166,14 +170,15 @@ build() {
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_INTERNATIONAL=ON \
     -DWITH_JACK=ON \
-    -DWITH_JACK_DYNLOAD=ON \
+    -DWITH_JACK_DYNLOAD=OFF \
     -DWITH_LIBMV=OFF \
-    -DWITH_LLVM=ON \
+    -DWITH_LLVM=OFF \
     -DWITH_LZMA=ON \
     -DWITH_LZO=ON \
     -DWITH_MEM_JEMALLOC=OFF \
     -DWITH_MEM_VALGRIND=OFF \
     -DWITH_MOD_BOOLEAN=ON \
+    -DWITH_MOD_CLOTH_ELTOPO=OFF \
     -DWITH_MOD_FLUID=ON \
     -DWITH_MOD_OCEANSIM=ON \
     -DWITH_MOD_REMESH=ON \
@@ -194,20 +199,13 @@ build() {
     -DWITH_PYTHON_SECURITY=ON \
     -DWITH_RAYOPTIMIZATION=ON \
     -DWITH_SDL=ON \
+    -DWITH_SDL_DYNLOAD=OFF \
     -DWITH_STATIC_LIBS=OFF \
     -DWITH_SYSTEM_BULLET=OFF \
     -DWITH_SYSTEM_GLEW=ON \
     -DWITH_SYSTEM_OPENJPEG=ON \
     -DWITH_X11_XF86VMODE=ON \
     -DWITH_X11_XINPUT=ON
-
-   # for future blender
-   #-DWITH_MOD_CLOTH_ELTOPO=ON\
-
-   # 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"
-
   make
 }