[Bf-blender-cvs] [11c845e334f] master: build_environment: openimageio 1.8.13

[Ray Molenkamp]

Commit: 11c845e334f394f374d11750fcff76ea778a881f
Author: Ray Molenkamp
Date:   Thu Aug 16 13:43:23 2018 -0600
Branches: master
https://developer.blender.org/rB11c845e334f394f374d11750fcff76ea778a881f

build_environment: openimageio 1.8.13

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

M	build_files/build_environment/cmake/openimageio.cmake
M	build_files/build_environment/cmake/versions.cmake
A	build_files/build_environment/patches/openimageio_static_libs.diff
D	build_files/build_environment/patches/openimageio_staticexr.diff

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

diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake
index 43390e46793..73d1f4a7871 100644
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -109,7 +109,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
 	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
 	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
+	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
 	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
 	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
 	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
@@ -127,7 +127,7 @@ ExternalProject_Add(external_openimageio
 	PREFIX ${BUILD_DIR}/openimageio
 	PATCH_COMMAND
 		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
-		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_staticexr.diff
+		${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/openimageio
 )
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 3958deaaaef..2a465034d32 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -126,14 +126,9 @@ set(CLANG_HASH 4e419bd4e3b55aa06d872320f754bd85)
 set(OPENMP_URI http://releases.llvm.org/${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
 set(OPENMP_HASH 4826402ae3633c36c51ba4d0e5527d30)
 
-set(OPENIMAGEIO_VERSION 1.7.15)
-set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.zip)
-set(OPENIMAGEIO_HASH_178 e156e3669af0e1373142ab5e8f13de66)
-set(OPENIMAGEIO_HASH_179 4121cb0e0433bda6a7ef32c8628a149f)
-set(OPENIMAGEIO_HASH_1713 42a662775b834161ba88c6abdb299360)
-set(OPENIMAGEIO_HASH_1715 e2ece0f62c013d64c478f82265988b0b)
-set(OPENIMAGEIO_HASH ${OPENIMAGEIO_HASH_1715})
-
+set(OPENIMAGEIO_VERSION 1.8.13)
+set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
+set(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93)
 
 set(TIFF_VERSION 4.0.9)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
diff --git a/build_files/build_environment/patches/openimageio_static_libs.diff b/build_files/build_environment/patches/openimageio_static_libs.diff
new file mode 100644
index 00000000000..ca3d913d027
--- /dev/null
+++ b/build_files/build_environment/patches/openimageio_static_libs.diff
@@ -0,0 +1,11 @@
+diff -Naur external_openimageio.orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake
+--- external_openimageio.orig/src/cmake/compiler.cmake	2018-07-31 23:45:19 -0600
++++ external_openimageio/src/cmake/compiler.cmake	2018-08-16 12:50:12 -0600
+@@ -152,6 +152,7 @@
+     add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
+     add_definitions (-D_SCL_SECURE_NO_WARNINGS)
+     add_definitions (-DJAS_WIN_MSVC_BUILD)
++    add_definitions (-DOPJ_STATIC)
+ endif (MSVC)
+ 
+ # Use ccache if found
diff --git a/build_files/build_environment/patches/openimageio_staticexr.diff b/build_files/build_environment/patches/openimageio_staticexr.diff
deleted file mode 100644
index e1f0f473057..00000000000
--- a/build_files/build_environment/patches/openimageio_staticexr.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt	2016-11-01 01:03:44 -0600
-+++ CMakeLists.txt	2016-12-01 09:20:12 -0700
-@@ -454,7 +454,7 @@
-     add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
-     add_definitions (-D_SCL_SECURE_NO_WARNINGS)
-     add_definitions (-DJAS_WIN_MSVC_BUILD)
--    add_definitions (-DOPENEXR_DLL)
-+    add_definitions (-DOPJ_STATIC)
-     if (LINKSTATIC)
-         add_definitions (-DBoost_USE_STATIC_LIBS=1)
-     else ()