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

[Sven-Hendrik Haase]

    Date: Tuesday, March 4, 2014 @ 05:01:25
  Author: svenstaro
Revision: 106472

Fix Blender build

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-04 03:36:55 UTC (rev 106471)
+++ PKGBUILD	2014-03-04 04:01:25 UTC (rev 106472)
@@ -5,14 +5,19 @@
 
 # Sometimes blender.org takes some time to release patch releases and because Arch users
 # are impatient, we sometimes need to build from git directly.
+# Update because I get so many queries on this:
+# Due to our other rolling deps, it's sometimes not possible to build Blender stable releases.
+# More often than not, a new openshadinglanguage breaks it and I could either backport fixes
+# or simply roll with a new version. I usually choose the latter when the former seems
+# unreasonable.
 
-_gitcommit=c7ac0e
+_gitcommit=13290d
 
 pkgname=blender
 pkgver=2.69
 [[ -n $_gitcommit ]] && pkgver=2.69.$_gitcommit
 pkgrel=1
-epoch=12
+epoch=13
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -42,9 +47,12 @@
   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
+      git submodule init
+      git config submodule."release/scripts/addons".url ${srcdir}/blender-addons
+      git config submodule."release/scripts/addons_contrib".url ${srcdir}/blender-addons-contrib
+      git config submodule."release/datafiles/locale".url ${srcdir}/blender-translations
+      git config submodule."scons".url ${srcdir}/scons
+      git submodule update
   fi
 }