[Bf-blender-cvs] [28f0a4b27e5] master: Fix (unreported) broken OCIO from install_deps.

[Bastien Montagne]

Commit: 28f0a4b27e5b98e9060c3c86062b4155d70d94f3
Author: Bastien Montagne
Date:   Sat Feb 27 13:07:11 2021 +0100
Branches: master
https://developer.blender.org/rB28f0a4b27e5b98e9060c3c86062b4155d70d94f3

Fix (unreported) broken OCIO from install_deps.

Looks like they removed static libs by default in OCIO 2.0, for some
historical reasons `install_deps` was enforcing using only static libs
for this one, now removed it so that Blender buil can use usual so's.

===================================================================

M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 259a0bd0c33..3b364c21f7d 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1732,7 +1732,7 @@ compile_OCIO() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  ocio_magic=2
+  ocio_magic=3
   _init_ocio
 
   # Force having own builds for the dependencies.
@@ -1802,11 +1802,11 @@ compile_OCIO() {
     make -j$THREADS && make install
 
     # Force linking against static libs
-    rm -f $_inst/lib/*.so*
+    #rm -f $_inst/lib/*.so*
 
     # Additional depencencies
-    cp ext/dist/lib/libtinyxml.a $_inst/lib
-    cp ext/dist/lib/libyaml-cpp.a $_inst/lib
+    #cp ext/dist/lib/libtinyxml.a $_inst/lib
+    #cp ext/dist/lib/libyaml-cpp.a $_inst/lib
 
     make clean