diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-05-31 22:15:40 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-05-31 22:15:40 +0300 |
commit | 4cb883b6b2119385bbb4d1af050b491a62f52e4a (patch) | |
tree | cc498293364e36a6464bcb70a207a9730403e465 | |
parent | 6f1056ae635419245da245e70a0c7d4e6ff26a2f (diff) |
Deps: Update OIIO + ImageLibs + OSL + Helpers
This is the cluster of OIIO and friends , since they are all kinda tangled best to deal with this as a single unit
OIIO 2.1.15.0
png 1.6.37
jpeg 2.0.4
opencolorio 1.1.1
tiff 4.1.0
OSL 1.10.10
pugixml 1.10
openjpeg 2.3.1
Differential Revision: https://developer.blender.org/D7727
Reviewed by: brecht
10 files changed, 119 insertions, 116 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index d05a06c9518..9acafe8f8e6 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -31,10 +31,6 @@ if(BUILD_MODE STREQUAL Release) COMMAND # jpeg rename libfile + copy include ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ && - # OpenImageIO - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe && # png ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ && @@ -55,9 +51,7 @@ endif() if(BUILD_MODE STREQUAL Debug) add_custom_target(Harvest_Debug_Results - # OpenImageIO - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib && + COMMAND # hdf5 ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib && DEPENDS Package_Python diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake index 0d611219353..e0200d84897 100644 --- a/build_files/build_environment/cmake/jpeg.cmake +++ b/build_files/build_environment/cmake/jpeg.cmake @@ -42,20 +42,17 @@ if(WIN32) set(JPEG_LIBRARY jpeg-staticd${LIBEXT}) endif() else(WIN32) - # autoconf for unix - if(APPLE) - set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8) - else() - set(JPEG_EXTRA_ARGS --with-jpeg8) - endif() + # cmake for unix + set(JPEG_EXTRA_ARGS + -DWITH_JPEG8=ON + -DENABLE_STATIC=ON + -DENABLE_SHARED=OFF + -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib) ExternalProject_Add(external_jpeg URL ${JPEG_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${JPEG_HASH} - CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS} - BUILD_IN_SOURCE 1 - BUILD_COMMAND ${CONFIGURE_ENV} && make install PREFIX ${BUILD_DIR}/jpg CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/jpg diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index 27e04a1f1d1..63489993fa7 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -32,7 +32,7 @@ endif() if(WIN32) set(PNG_LIBNAME libpng16_static${LIBEXT}) - set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1) + set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2) set(OPENJPEG_POSTFIX _msvc) else() set(PNG_LIBNAME libpng${LIBEXT}) @@ -49,23 +49,17 @@ endif() if(MSVC) set(OPENJPEG_FLAGS - -DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc - -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION} - -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT} - -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT} + -DOpenJpeg_ROOT=${LIBDIR}/openjpeg_msvc ) else() set(OPENJPEG_FLAGS - -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} - -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY} + -DOpenJpeg_ROOT=${LIBDIR}/openjpeg ) endif() set(OPENIMAGEIO_EXTRA_ARGS - -DBUILDSTATIC=ON + -DBUILD_SHARED_LIBS=OFF ${OPENIMAGEIO_LINKSTATIC} - -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/ - -DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT} -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING} -DBoost_USE_MULTITHREADED=ON -DBoost_USE_STATIC_LIBS=ON @@ -74,6 +68,14 @@ set(OPENIMAGEIO_EXTRA_ARGS -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/ -DBoost_NO_SYSTEM_PATHS=ON -OIIO_BUILD_CPP11=ON + -DUSE_LIBSQUISH=OFF + -DUSE_QT5=OFF + -DUSE_NUKE=OFF + -DUSE_OPENVDB=OFF + -DUSE_BZIP2=OFF + -DUSE_FREETYPE=OFF + -DUSE_DCMTK=OFF + -DUSE_LIBHEIF=OFF -DUSE_OPENGL=OFF -DUSE_TBB=OFF -DUSE_FIELD3D=OFF @@ -81,15 +83,12 @@ set(OPENIMAGEIO_EXTRA_ARGS -DUSE_PYTHON=OFF -DUSE_GIF=OFF -DUSE_OPENCV=OFF - -DUSE_OPENSSL=OFF -DUSE_OPENJPEG=ON -DUSE_FFMPEG=OFF -DUSE_PTEX=OFF -DUSE_FREETYPE=OFF -DUSE_LIBRAW=OFF - -DUSE_PYTHON=OFF - -DUSE_PYTHON3=OFF - -DUSE_OCIO=OFF + -DUSE_OPENCOLORIO=OFF -DUSE_WEBP=${WITH_WEBP} -DOIIO_BUILD_TOOLS=${OIIO_TOOLS} -DOIIO_BUILD_TESTS=OFF @@ -103,17 +102,13 @@ set(OPENIMAGEIO_EXTRA_ARGS -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY} -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include ${OPENJPEG_FLAGS} - -DOCIO_PATH=${LIBDIR}/opencolorio/ -DOpenEXR_USE_STATIC_LIBS=On - -DOPENEXR_HOME=${LIBDIR}/openexr/ - -DILMBASE_INCLUDE_PATH=${LIBDIR}/openexr/ - -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/openexr/ -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/ + -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/ -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT} -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT} -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT} -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT} - -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/ -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT} -DSTOP_ON_WARNING=OFF ${WEBP_FLAGS} @@ -125,27 +120,39 @@ ExternalProject_Add(external_openimageio DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${OPENIMAGEIO_HASH} 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 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff + PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openimageio ) add_dependencies( external_openimageio - external_png external_zlib + external_png + external_zlib external_openexr external_jpeg external_boost external_tiff - external_opencolorio external_openjpeg${OPENJPEG_POSTFIX} ${WEBP_DEP} ) -if(NOT WIN32) - add_dependencies( - external_openimageio - external_opencolorio_extra - ) + +if(WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_openimageio after_install + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe + + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_openimageio after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib + DEPENDEES install + ) + endif() endif() + diff --git a/build_files/build_environment/cmake/png.cmake b/build_files/build_environment/cmake/png.cmake index 2bf32b77ce9..8dd3c25b88b 100644 --- a/build_files/build_environment/cmake/png.cmake +++ b/build_files/build_environment/cmake/png.cmake @@ -25,7 +25,7 @@ set(PNG_EXTRA_ARGS ExternalProject_Add(external_png URL ${PNG_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH MD5=${PNG_HASH} + URL_HASH SHA256=${PNG_HASH} PREFIX ${BUILD_DIR}/png CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/png diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index d7fbd88db6b..c1dcf98318c 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -24,13 +24,13 @@ set(OPENAL_VERSION 1.20.1) set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2) set(OPENAL_HASH 556695068ce8375b89986083d810fd35) -set(PNG_VERSION 1.6.35) +set(PNG_VERSION 1.6.37) set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz) -set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6) +set(PNG_HASH 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca) -set(JPEG_VERSION 1.5.3) +set(JPEG_VERSION 2.0.4) set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz) -set(JPEG_HASH 5b7549d440b86c98a517355c102d155e) +set(JPEG_HASH 44c43e4a9fb352f47090804529317c88) set(BOOST_VERSION 1.70.0) set(BOOST_VERSION_NODOTS 1_70_0) @@ -113,9 +113,9 @@ set(OPENCOLLADA_VERSION v1.6.68) set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz) set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493) -set(OPENCOLORIO_VERSION 1.1.0) -set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz) -set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8) +set(OPENCOLORIO_VERSION 1.1.1) +set(OPENCOLORIO_URI https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz) +set(OPENCOLORIO_HASH 23d8b9ac81599305539a5a8674b94a3d) set(LLVM_VERSION 9.0.1) set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz) @@ -127,17 +127,17 @@ set(CLANG_HASH 13468e4a44940efef1b75e8641752f90) set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz) set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf) -set(OPENIMAGEIO_VERSION 1.8.13) +set(OPENIMAGEIO_VERSION 2.1.15.0) set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz) -set(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93) +set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832) -set(TIFF_VERSION 4.0.9) +set(TIFF_VERSION 4.1.0) set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz) -set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79) +set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424) -set(OSL_VERSION 1.10.9) +set(OSL_VERSION 1.10.10) set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz) -set(OSL_HASH a94f1e8506f7e8f5e993653de5c5fa00) +set(OSL_HASH 00dec08a93c8084e53848b9ad047889f) set(PYTHON_VERSION 3.7.4) set(PYTHON_SHORT_VERSION 3.7) @@ -199,12 +199,10 @@ set(XVIDCORE_VERSION 1.3.7) set(XVIDCORE_URI https://downloads.xvid.com/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz) set(XVIDCORE_HASH abbdcbd39555691dd1c9b4d08f0a031376a3b211652c0d8b3b8aa9be1303ce2d) -# This has to be in sync with the version in blenders /extern folder. -set(OPENJPEG_VERSION 2.3.0) +set(OPENJPEG_VERSION 2.3.1) set(OPENJPEG_SHORT_VERSION 2.3) -# Use slightly newer commit after release which includes a cmake fix -set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip) -set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b) +set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz) +set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9) set(FFMPEG_VERSION 4.2.3) set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2) @@ -263,9 +261,9 @@ set(LCMS_VERSION 2.9) set(LCMS_URI https://nchc.dl.sourceforge.net/project/lcms/lcms/${LCMS_VERSION}/lcms2-${LCMS_VERSION}.tar.gz) set(LCMS_HASH 8de1b7724f578d2995c8fdfa35c3ad0e) -set(PUGIXML_VERSION 1.9) -set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v1.9.tar.gz) -set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714) +set(PUGIXML_VERSION 1.10) +set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v${PUGIXML_VERSION}.tar.gz) +set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd) set(FLEXBISON_VERSION 2.5.5) set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip) diff --git a/build_files/build_environment/patches/openimageio.diff b/build_files/build_environment/patches/openimageio.diff new file mode 100644 index 00000000000..d05fc1f295f --- /dev/null +++ b/build_files/build_environment/patches/openimageio.diff @@ -0,0 +1,36 @@ +diff -Naur orig/CMakeLists.txt external_openimageio/CMakeLists.txt +--- orig/CMakeLists.txt 2020-05-10 21:43:52 -0600 ++++ external_openimageio/CMakeLists.txt 2020-05-13 17:03:35 -0600 +@@ -170,7 +170,7 @@ + add_subdirectory (src/iinfo) + add_subdirectory (src/maketx) + add_subdirectory (src/oiiotool) +- add_subdirectory (src/testtex) ++ #add_subdirectory (src/testtex) + add_subdirectory (src/iv) + endif () + +diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake +--- orig/src/cmake/compiler.cmake 2020-05-10 21:43:52 -0600 ++++ external_openimageio/src/cmake/compiler.cmake 2020-05-13 17:02:54 -0600 +@@ -172,6 +172,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) + + if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" +diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/include/OpenImageIO/platform.h +--- orig/src/include/OpenImageIO/platform.h 2020-05-10 21:43:52 -0600 ++++ external_openimageio/src/include/OpenImageIO/platform.h 2020-05-13 17:04:36 -0600 +@@ -41,6 +41,9 @@ + # ifndef NOMINMAX + # define NOMINMAX + # endif ++# ifndef NOGDI ++# define NOGDI ++# endif + # include <windows.h> + #endif + diff --git a/build_files/build_environment/patches/openimageio_gdi.diff b/build_files/build_environment/patches/openimageio_gdi.diff deleted file mode 100644 index af0c90638de..00000000000 --- a/build_files/build_environment/patches/openimageio_gdi.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: OpenImageIO/osdep.h -=================================================================== ---- OpenImageIO/osdep.h (revision 61595) -+++ OpenImageIO/osdep.h (working copy) -@@ -34,6 +34,7 @@ - # define WIN32_LEAN_AND_MEAN - # define VC_EXTRALEAN - # define NOMINMAX -+# define NOGDI - # include <windows.h> - #endif - -Index: OpenImageIO/platform.h -=================================================================== ---- OpenImageIO/platform.h (revision 61595) -+++ OpenImageIO/platform.h (working copy) -@@ -77,6 +77,9 @@ - # ifndef NOMINMAX - # define NOMINMAX - # endif -+# ifndef NOGDI -+# define NOGDI -+# endif - # include <windows.h> - #endif - diff --git a/build_files/build_environment/patches/openimageio_static_libs.diff b/build_files/build_environment/patches/openimageio_static_libs.diff deleted file mode 100644 index 6a2e58bd139..00000000000 --- a/build_files/build_environment/patches/openimageio_static_libs.diff +++ /dev/null @@ -1,22 +0,0 @@ -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 ---- external_openimageio.orig/CMakeLists.txt 2018-07-31 23:45:19 -0600 -+++ external_openimageio/CMakeLists.txt 2018-08-17 15:22:56 -0600 -@@ -169,7 +169,7 @@ - add_subdirectory (src/iinfo) - add_subdirectory (src/maketx) - add_subdirectory (src/oiiotool) -- add_subdirectory (src/testtex) -+# add_subdirectory (src/testtex) - add_subdirectory (src/iv) - endif () - diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index b9b5937ae2b..989800174e2 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -48,3 +48,22 @@ diff -Naur OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp extern size_t LLVM_Util::total_jit_memory_held () +diff -Naur OpenShadingLanguage-Release-1.9.9/CMakeLists.txt external_osl/CMakeLists.txt + --- orig/CMakeLists.txt 2020-01-27 16:22:31 -0700 ++++ external_osl/CMakeLists.txt 2020-05-13 18:04:52 -0600 +@@ -102,10 +102,11 @@ + set (OPTIX_EXTRA_LIBS CACHE STRING "Extra lib targets needed for OptiX") + set (CUDA_TARGET_ARCH "sm_35" CACHE STRING "CUDA GPU architecture (e.g. sm_35)") + +-# set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") +-# if (USE_OIIO_STATIC) +-# add_definitions ("-DOIIO_STATIC_BUILD=1") +-# endif () ++set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") ++if (USE_OIIO_STATIC) ++ add_definitions ("-DOIIO_STATIC_BUILD=1") ++ add_definitions ("-DOIIO_STATIC_DEFINE=1") ++endif () + + set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem") + if (OSL_NO_DEFAULT_TEXTURESYSTEM)
\ No newline at end of file diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 57bfe19a5bc..db939b1d00c 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -478,7 +478,7 @@ if(WITH_OPENIMAGEIO) set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0") set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD") set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe") - add_definitions(-DOIIO_STATIC_BUILD) + add_definitions(-DOIIO_STATIC_DEFINE) add_definitions(-DOIIO_NO_SSE=1) endif() |