diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-08 20:57:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-08 20:57:58 +0300 |
| commit | c7ea7e4c9a8cfdec2dc49fed9510e442136e1b59 (patch) | |
| tree | 999a1c0adb5ba4d69d37503ee9fa349835130dfd /build_files | |
| parent | eada698c0e673bf8e8dbb1461317edb6faf45029 (diff) | |
install_deps: bump OIIO and OSL to 1.6.9.
And we can even use vanilia version of OSL now! :D
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index dd2f1e31492..c96c629cc34 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -287,9 +287,9 @@ OPENEXR_FORCE_REBUILD=false OPENEXR_SKIP=false _with_built_openexr=false -OIIO_VERSION="1.4.16" -OIIO_VERSION_MIN="1.4.0" -OIIO_VERSION_MAX="1.5.0" # Not supported by current OSL... +OIIO_VERSION="1.6.9" +OIIO_VERSION_MIN="1.6.0" +OIIO_VERSION_MAX="1.9.0" # UNKNOWN currently # Not supported by current OSL... OIIO_FORCE_BUILD=false OIIO_FORCE_REBUILD=false OIIO_SKIP=false @@ -302,7 +302,7 @@ LLVM_FORCE_REBUILD=false LLVM_SKIP=false # OSL needs to be compiled for now! -OSL_VERSION="1.5.11" +OSL_VERSION="1.6.9" OSL_VERSION_MIN=$OSL_VERSION OSL_FORCE_BUILD=false OSL_FORCE_REBUILD=false @@ -648,9 +648,9 @@ OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4" LLVM_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" ) LLVM_CLANG_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.gz" ) -OSL_USE_REPO=true -#~ OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz" ) -OSL_SOURCE=( "https://github.com/Nazg-Gul/OpenShadingLanguage/archive/Release-1.5.11.tar.gz" ) +OSL_USE_REPO=false +OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz" ) +#~ OSL_SOURCE=( "https://github.com/Nazg-Gul/OpenShadingLanguage/archive/Release-1.5.11.tar.gz" ) #~ OSL_SOURCE_REPO=( "https://github.com/imageworks/OpenShadingLanguage.git" ) #~ OSL_SOURCE_REPO=( "https://github.com/mont29/OpenShadingLanguage.git" ) #~ OSL_SOURCE_REPO_UID="85179714e1bc69cd25ecb6bb711c1a156685d395" @@ -1406,7 +1406,7 @@ clean_OIIO() { compile_OIIO() { # To be changed each time we make edits that would modify the compiled result! - oiio_magic=14 + oiio_magic=15 _init_oiio # Clean install if needed! @@ -1632,7 +1632,7 @@ clean_OSL() { compile_OSL() { # To be changed each time we make edits that would modify the compiled result! - osl_magic=17 + osl_magic=18 _init_osl # Clean install if needed! |