[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52302] trunk/blender/build_files/ build_environment/install_deps.sh: Install dependencies: workaround for SHA linking issues

Sergey Sharybin sergey.vfx at gmail.com
Sat Nov 17 13:59:28 CET 2012


Revision: 52302
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52302
Author:   nazgul
Date:     2012-11-17 12:59:24 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Install dependencies: workaround for SHA linking issues

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	2012-11-17 12:10:35 UTC (rev 52301)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 12:59:24 UTC (rev 52302)
@@ -347,6 +347,25 @@
       INFO "Unpacking OpenImageIO-$OIIO_VERSION"
       tar -C $SRC --transform "s,(.*/?)OpenImageIO-oiio[^/]*(.*),\1OpenImageIO-$OIIO_VERSION\2,x" \
           -xf $_src.tar.gz
+
+      cd $_src
+      cat << EOF | patch -p1
+diff --git a/src/libutil/SHA1.cpp b/src/libutil/SHA1.cpp
+index b9e6c8b..c761185 100644
+--- a/src/libutil/SHA1.cpp
++++ b/src/libutil/SHA1.cpp
+@@ -8,9 +8,9 @@
+ 
+ // If compiling with MFC, you might want to add #include "StdAfx.h"
+ 
++#include "SHA1.h"
+ #include "hash.h"
+ #include "dassert.h"
+-#include "SHA1.h"
+ 
+ #ifdef SHA1_UTILITY_FUNCTIONS
+ #define SHA1_MAX_FILE_BUFFER 8000
+EOF
     fi
 
     cd $_src




More information about the Bf-blender-cvs mailing list