diff options
author | Thomas Dinges <blender@dingto.org> | 2013-02-23 04:52:59 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-02-23 04:52:59 +0400 |
commit | 31e6af92c81a9e45f9fbf0667d242fe1493f3e13 (patch) | |
tree | b788493f0a75c371e6a5a1089baad3734382f442 /build_files | |
parent | bd8f4cc4d6de396c902ee47261baba11bdd8f0a1 (diff) |
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.
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 97bd94f55b2..5815158f4f5 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -188,7 +188,7 @@ OCIO_VERSION_MIN="1.0" 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_FORCE_REBUILD=false 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 @@ compile_OIIO() { 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 @@ print_info() { 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" |