diff options
Diffstat (limited to 'build_files/build_environment/install_deps.sh')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 3852b4fe705..6e2910731bb 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -292,13 +292,13 @@ NO_BUILD=false NO_CONFIRM=false USE_CXX11=false -PYTHON_VERSION="3.5.3" -PYTHON_VERSION_MIN="3.5" +PYTHON_VERSION="3.6.2" +PYTHON_VERSION_MIN="3.6" PYTHON_FORCE_BUILD=false PYTHON_FORCE_REBUILD=false PYTHON_SKIP=false -NUMPY_VERSION="1.10.1" +NUMPY_VERSION="1.13.1" NUMPY_VERSION_MIN="1.8" NUMPY_FORCE_BUILD=false NUMPY_FORCE_REBUILD=false @@ -739,7 +739,7 @@ PRINT "" # This has to be done here, because user might force some versions... PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" ) -NUMPY_SOURCE=( "http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz" ) +NUMPY_SOURCE=( "https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz" ) _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'` BOOST_SOURCE=( "http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$_boost_version_nodots.tar.bz2/download" ) @@ -1599,7 +1599,7 @@ compile_OIIO() { fi # To be changed each time we make edits that would modify the compiled result! - oiio_magic=16 + oiio_magic=17 _init_oiio # Clean install if needed! @@ -1663,6 +1663,9 @@ compile_OIIO() { INFO "ILMBASE_HOME=$INST/openexr" fi + # ptex is only needed when nicholas bishop is ready + cmake_d="$cmake_d -D USE_PTEX=OFF" + # Optional tests and cmd tools cmake_d="$cmake_d -D USE_QT=OFF" cmake_d="$cmake_d -D USE_PYTHON=OFF" @@ -1774,7 +1777,7 @@ compile_LLVM() { cd $_src # XXX Ugly patching hack! - patch -p1 -i "$SCRIPT_DIR/install_deps_patches/llvm.patch" + patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.diff" cd $CWD @@ -1880,7 +1883,7 @@ compile_OSL() { git reset --hard # XXX Ugly patching hack! - patch -p1 -i "$SCRIPT_DIR/install_deps_patches/osl.patch" + patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.diff" fi # Always refresh the whole build! |