From 7e9644a4e95bde7d9bb9f5d37712b1c020061c51 Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Mon, 14 Jun 2021 10:10:55 -0700 Subject: [PATCH] update build instructions --- .travis.yml | 4 ++-- INSTALL_LINUX.md | 10 +++++----- INSTALL_MACOS.md | 4 ++-- OpenColorIO-Configs-README.md | 4 ++-- tools/travis/install_dependencies.sh | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d15dec04c..aeed4e85de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,8 +179,8 @@ install: - tools/travis/install_dependencies.sh - if [ ! -d "$HOME/OpenColorIO-Configs" ]; then pushd $HOME; - curl -k -L https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.3.tar.gz | tar -xvzf -; - mv OpenColorIO-Configs-Natron-v2.3 OpenColorIO-Configs; + curl -k -L https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.4.tar.gz | tar -xvzf -; + mv OpenColorIO-Configs-Natron-v2.4 OpenColorIO-Configs; popd; else echo 'Using cached OpenColorIO-Configs'; diff --git a/INSTALL_LINUX.md b/INSTALL_LINUX.md index 6649c38482..798329e5f5 100644 --- a/INSTALL_LINUX.md +++ b/INSTALL_LINUX.md @@ -122,16 +122,16 @@ git submodule update -i --recursive ### Download OpenColorIO-Configs In the past, OCIO configs were a submodule, though due to the size of the repository, we have chosen instead -to make a tarball release and let you download it [here](https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.3.tar.gz). +to make a tarball release and let you download it [here](https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.4.tar.gz). Place it at the root of Natron repository. -***note:*** *If it is name something like: `OpenColorIO-Configs-Natron-v2.3` rename it to `OpenColorIO-Configs`* +***note:*** *If it is name something like: `OpenColorIO-Configs-Natron-v2.4` rename it to `OpenColorIO-Configs`* ``` -wget https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.3.tar.gz -tar -xvzf Natron-v2.3.tar.gz -mv OpenColorIO-Configs-Natron-v2.3 OpenColorIO-Configs +wget https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.4.tar.gz +tar -xvzf Natron-v2.4.tar.gz +mv OpenColorIO-Configs-Natron-v2.4 OpenColorIO-Configs ``` ***note:*** In order to reclaim disk space, you may keep only the following subfolder : blender*, natron, nuke-default diff --git a/INSTALL_MACOS.md b/INSTALL_MACOS.md index 6d63e5c156..f15b5c7dc4 100644 --- a/INSTALL_MACOS.md +++ b/INSTALL_MACOS.md @@ -319,11 +319,11 @@ git submodule update -i --recursive ### Download OpenColorIO-Configs In the past, OCIO configs were a submodule, though due to the size of the repository, we have chosen instead -to make a tarball release and let you download it [here](https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.3.tar.gz). +to make a tarball release and let you download it [here](https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.4.tar.gz). Place it at the root of Natron source tree: ```Shell -curl -k -L https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.3.tar.gz | tar zxf - +curl -k -L https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.4.tar.gz | tar zxf - mv OpenColorIO-Configs-Natron-v2.1 OpenColorIO-Configs ``` diff --git a/OpenColorIO-Configs-README.md b/OpenColorIO-Configs-README.md index cc779d2bf1..1bd1634222 100644 --- a/OpenColorIO-Configs-README.md +++ b/OpenColorIO-Configs-README.md @@ -2,5 +2,5 @@ As mentionned in the INSTALL files, the default OpenColorIO configuration files must be downloaded and unpacked at the root of the Natron source tree, using something like: - curl -k -L https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.3.tar.gz | tar zxf - - mv OpenColorIO-Configs-Natron-v2.3 OpenColorIO-Configs + curl -k -L https://github.com/NatronGitHub/OpenColorIO-Configs/archive/Natron-v2.4.tar.gz | tar zxf - + mv OpenColorIO-Configs-Natron-v2.4 OpenColorIO-Configs diff --git a/tools/travis/install_dependencies.sh b/tools/travis/install_dependencies.sh index f65346106e..5ce67274e4 100755 --- a/tools/travis/install_dependencies.sh +++ b/tools/travis/install_dependencies.sh @@ -201,9 +201,9 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then fi # - openimageio if [ ! -d "$HOME/oiio/lib" ]; then - wget https://github.com/OpenImageIO/oiio/archive/Release-2.2.12.0.tar.gz -O /tmp/oiio.tgz; + wget https://github.com/OpenImageIO/oiio/archive/Release-2.2.15.1.tar.gz -O /tmp/oiio.tgz; tar -xvzf /tmp/oiio.tgz -C $HOME; - pushd $HOME/oiio-Release-2.2.12.0; + pushd $HOME/oiio-Release-2.2.15.1; mkdir _build && cd _build; cmake -DCMAKE_INSTALL_PREFIX=$HOME/oiio -DILMBASE_ROOT_DIR=$HOME/openexr -DOPENEXR_ROOT_DIR=$HOME/openexr -DOCIO_HOME=$HOME/ocio -DUSE_QT=OFF -DUSE_PYTHON=OFF -DUSE_PYTHON3=OFF -DUSE_FIELD3D=OFF -DUSE_FFMPEG=OFF -DUSE_OPENJPEG=ON -DUSE_OCIO=ON -DUSE_OPENCV=OFF -DUSE_OPENSSL=OFF -DUSE_FREETYPE=ON -DUSE_GIF=OFF -DUSE_PTEX=OFF -DUSE_LIBRAW=ON -DOIIO_BUILD_TESTS=OFF -DOIIO_BUILD_TOOLS=OFF -DSTOP_ON_WARNING=OFF ..; make $J && make install;