[arch-commits] Commit in blender/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Thursday, January 9, 2014 @ 02:47:39
  Author: svenstaro
Revision: 103666

upgpkg: blender 10:2.69.a0dbee6e-3

bump and build against llvm 3.4

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-09 00:48:14 UTC (rev 103665)
+++ PKGBUILD	2014-01-09 01:47:39 UTC (rev 103666)
@@ -6,12 +6,12 @@
 # Sometimes blender.org takes some time to release patch releases and because Arch users
 # are impatient, we sometimes need to build from git directly.
 
-#_gitcommit=58224
+_gitcommit=a0dbee6e
 
 pkgname=blender
 pkgver=2.69
 [[ -n $_gitcommit ]] && pkgver=2.69.$_gitcommit
-pkgrel=2
+pkgrel=3
 epoch=10
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
@@ -19,9 +19,9 @@
 url="http://www.blender.org"
 depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
          'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
-         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
+         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' 'llvm'
          'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage')
-makedepends=('cmake' 'boost' 'subversion' 'mesa')
+makedepends=('cmake' 'boost' 'subversion' 'mesa' 'git')
 [[ $CARCH == x86_64 ]] && makedepends+=('cuda')
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip)
@@ -30,17 +30,30 @@
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
 md5sums=('e77f53951fdaea69631cdd8c0f42cbcb')
 else
-  source=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}")
-  true && md5sums=('SKIP')
+  source=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}"
+          "git://git.blender.org/blender-addons.git"
+          "git://git.blender.org/blender-addons-contrib.git"
+          "git://git.blender.org/blender-translations.git"
+          "git://git.blender.org/scons.git")
+  true && md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 fi
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  if [[ -n $_gitcommit ]]; then
+    git submodule update --init --recursive
+    git submodule foreach git checkout master
+    git submodule foreach git pull --rebase origin master
+  fi
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  mkdir build
-  cd build
+  mkdir build && cd build
 
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF"
+  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF" || ENABLESSE2=""
   [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
 
   cmake .. \
@@ -56,17 +69,18 @@
     -DWITH_CODEC_FFMPEG=ON \
     -DWITH_CODEC_SNDFILE=ON \
     -DWITH_CYCLES=ON \
+    -DWITH_LLVM=ON \
+    -DLLVM_VERSION=3.4 \
+    -DLLVM_STATIC=OFF \
     -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
     -DWITH_CYCLES_OSL=ON \
-    -DCUDA_TOOLKIT_ROOT_DIR=/opt/cuda/ \
     -DWITH_FFTW3=ON \
     -DWITH_MOD_OCEANSIM=ON \
     -DPYTHON_VERSION=3.3 \
     -DPYTHON_LIBPATH=/usr/lib \
     -DPYTHON_LIBRARY=python3.3m \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \
     $ENABLESSE2
-    # Remove the openjpeg line once blender accepts my patch
   make
 }