[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55541] trunk/blender/build_files/ build_environment/install_deps.sh: Fix for opencollada building in install_deps.sh script.

Bastien Montagne montagne29 at wanadoo.fr
Sat Mar 23 18:28:24 CET 2013


Revision: 55541
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55541
Author:   mont29
Date:     2013-03-23 17:28:24 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Fix for opencollada building in install_deps.sh script.

Stick to rev c89cf095c40aa2a518b1104c448825eacc92d174 of opencollada repo, next commit breaks API and prevent blender from building anymore... :(

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2013-03-23 17:11:03 UTC (rev 55540)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2013-03-23 17:28:24 UTC (rev 55541)
@@ -1064,8 +1064,12 @@
     cd $_src
 
     # XXX For now, always update from latest repo...
-    git pull origin
+    git pull origin master
 
+    # XXX We have to stick to this revision, the next one introduced a change to ExtraHandler' parseElement signature :/
+    git checkout c89cf095c40aa2a518b1104c448825eacc92d174
+    git reset --hard
+
     # Always refresh the whole build!
     if [ -d build ]; then
       rm -rf build




More information about the Bf-blender-cvs mailing list