[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54770] trunk/blender/build_files/ build_environment/install_deps.sh: Install_deps script:

[Thomas Dinges]

Revision: 54770
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54770
Author:   dingto
Date:     2013-02-23 00:52:59 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
Install_deps script:
* Use OIIO 1.1.7, this removes the need for the ugly patch.
* Use official OSL 1.3.0 repo
* Print OSL path for scons

Tested on Ubuntu 12.10 x64.

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-02-23 00:46:58 UTC (rev 54769)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2013-02-23 00:52:59 UTC (rev 54770)
@@ -188,7 +188,7 @@
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false
 
-OIIO_VERSION="1.1.1"
+OIIO_VERSION="1.1.7"
 OIIO_SOURCE="https://github.com/OpenImageIO/oiio/tarball/Release-$OIIO_VERSION"
 OIIO_VERSION_MIN="1.1"
 OIIO_FORCE_REBUILD=false
@@ -203,8 +203,8 @@
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.2.0"
-OSL_SOURCE="https://github.com/mont29/OpenShadingLanguage/archive/blender-fixes.tar.gz"
+OSL_VERSION="1.3.0"
+OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.3.0.tar.gz"
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
@@ -780,27 +780,6 @@
       tar -C $SRC --transform "s,(.*/?)OpenImageIO-oiio[^/]*(.*),\1OpenImageIO-$OIIO_VERSION\2,x" \
           -xf $_src.tar.gz
 
-      cd $_src
-
-      # XXX Ugly patching hack!
-      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
-
       cd $CWD
 
     fi
@@ -2054,6 +2033,10 @@
     INFO "BF_OIIO = '$INST/oiio'"
   fi
 
+  if [ -d $INST/osl ]; then
+    INFO "BF_OSL = '$INST/osl'"
+  fi
+
   if [ -d $INST/boost ]; then
     INFO "BF_BOOST = '$INST/boost'"
     INFO "WITH_BF_BOOST = True"