diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-19 10:36:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-05-19 10:36:14 +0300 |
commit | 1f46da922a98c6badf6e2de13304358b3b0b7576 (patch) | |
tree | b4e6a47524627ad6f7a925876eecbccf9cf542b6 /build_files | |
parent | f95828a0182acb7c1ba0fa8afccd6acdf23bc5c2 (diff) | |
parent | 4a04d7ae8930502037cd23dc94ed1bc9bc0043ac (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/mask/mask_draw.c
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index dd1e7622be1..95cb82ee6ec 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -284,7 +284,7 @@ NO_BUILD=false NO_CONFIRM=false USE_CXX11=true # Mandatory in blender2.8 -PYTHON_VERSION="3.5.2" +PYTHON_VERSION="3.5.3" PYTHON_VERSION_MIN="3.5" PYTHON_FORCE_BUILD=false PYTHON_FORCE_REBUILD=false @@ -361,8 +361,7 @@ ALEMBIC_FORCE_BUILD=false ALEMBIC_FORCE_REBUILD=false ALEMBIC_SKIP=false -# Version?? -OPENCOLLADA_VERSION="1.3" +OPENCOLLADA_VERSION="1.6.47" OPENCOLLADA_FORCE_BUILD=false OPENCOLLADA_FORCE_REBUILD=false OPENCOLLADA_SKIP=false @@ -729,7 +728,10 @@ _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" ) BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options" +OCIO_USE_REPO=true OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION" ) +OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" ) +OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843" OPENEXR_USE_REPO=false OPENEXR_SOURCE=( "http://download.savannah.nongnu.org/releases/openexr/openexr-$OPENEXR_VERSION.tar.gz" ) @@ -778,7 +780,7 @@ ALEMBIC_SOURCE=( "https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}. # ALEMBIC_SOURCE_REPO_BRANCH="master" OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" ) -OPENCOLLADA_REPO_UID="3335ac164e68b2512a40914b14c74db260e6ff7d" +OPENCOLLADA_REPO_UID="22b1f4ff026881b4d2804d397730286ab7e3d090" OPENCOLLADA_REPO_BRANCH="master" FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" ) @@ -1260,7 +1262,7 @@ compile_OCIO() { fi # To be changed each time we make edits that would modify the compiled result! - ocio_magic=1 + ocio_magic=2 _init_ocio # Clean install if needed! @@ -1277,14 +1279,27 @@ compile_OCIO() { if [ ! -d $_src ]; then INFO "Downloading OpenColorIO-$OCIO_VERSION" mkdir -p $SRC - download OCIO_SOURCE[@] $_src.tar.gz - INFO "Unpacking OpenColorIO-$OCIO_VERSION" - tar -C $SRC --transform "s,(.*/?)imageworks-OpenColorIO[^/]*(.*),\1OpenColorIO-$OCIO_VERSION\2,x" \ - -xf $_src.tar.gz + if [ "$OCIO_USE_REPO" = true ]; then + git clone ${OCIO_SOURCE_REPO[0]} $_src + else + download OCIO_SOURCE[@] $_src.tar.gz + INFO "Unpacking OpenColorIO-$OCIO_VERSION" + tar -C $SRC --transform "s,(.*/?)imageworks-OpenColorIO[^/]*(.*),\1OpenColorIO-$OCIO_VERSION\2,x" \ + -xf $_src.tar.gz + fi + fi cd $_src + + if [ "$OCIO_USE_REPO" = true ]; then + # XXX For now, always update from latest repo... + git pull origin master + git checkout $OCIO_SOURCE_REPO_UID + git reset --hard + fi + # Always refresh the whole build! if [ -d build ]; then rm -rf build @@ -1490,7 +1505,6 @@ compile_OPENEXR() { if [ "$OPENEXR_USE_REPO" = true ]; then # XXX For now, always update from latest repo... git pull origin master - # Stick to same rev as windows' libs... git checkout $OPENEXR_SOURCE_REPO_UID git reset --hard oiio_src_path="../OpenEXR" |