Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 17 Aug 2018 11:00:52 +0000 (13:00 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 17 Aug 2018 11:00:52 +0000 (13:00 +0200)
18 files changed:
build_files/build_environment/CMakeLists.txt
build_files/build_environment/cmake/alembic.cmake
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/opencolorio.cmake
build_files/build_environment/cmake/openexr.cmake
build_files/build_environment/cmake/openimageio.cmake
build_files/build_environment/cmake/openvdb.cmake
build_files/build_environment/cmake/osl.cmake
build_files/build_environment/cmake/pugixml.cmake [new file with mode: 0644]
build_files/build_environment/cmake/python.cmake
build_files/build_environment/cmake/versions.cmake
build_files/build_environment/patches/opencollada.diff
build_files/build_environment/patches/openimageio_static_libs.diff [new file with mode: 0644]
build_files/build_environment/patches/openimageio_staticexr.diff [deleted file]
build_files/build_environment/patches/openvdb.diff
build_files/build_environment/patches/osl.diff
build_files/cmake/platform/platform_unix.cmake
source/blender/makesrna/intern/rna_render.c

index e9a4b69cd46e91a579cba69532db46a80093512d..15ac68ef0b026be7a7b949d9d46b79f9020d1127 100644 (file)
@@ -91,6 +91,7 @@ include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
 include(cmake/numpy.cmake)
+include(cmake/pugixml.cmake)
 
 if(WITH_WEBP)
        include(cmake/webp.cmake)
index b6d7105c7c46611c09fda59a5cc135fff52d65ad..b2e5a3d6754dcef9608a9e7410ec1ed669a1bb06 100644 (file)
@@ -40,10 +40,10 @@ set(ALEMBIC_EXTRA_ARGS
        -DBoost_NO_SYSTEM_PATHS=ON
        -DILMBASE_ROOT=${LIBDIR}/ilmbase
        -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR
-       -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half-2_3_s${LIBEXT}
-       -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_3_s${LIBEXT}
-       -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_3_s${LIBEXT}
-       -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_3_s${LIBEXT}
+       -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
        -DUSE_PYILMBASE=0
        -DUSE_PYALEMBIC=0
        -DUSE_ARNOLD=0
index 86d207e74690c6820d785d9f519e3a7c8b375c6f..a8305b002b9beede9289cbd20d809de7121dd87c 100644 (file)
@@ -126,7 +126,6 @@ endfunction()
 
 harvest(alembic/include alembic/include "*.h")
 harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
-harvest(alembic/bin alembic/bin "*")
 harvest(blosc/lib openvdb/lib "*.a")
 harvest(boost/include boost/include "*")
 harvest(boost/lib boost/lib "*.a")
@@ -157,6 +156,7 @@ harvest(opencollada/include/opencollada opencollada/include "*.h")
 harvest(opencollada/lib/opencollada opencollada/lib "*.a")
 harvest(opencolorio/include opencolorio/include "*.h")
 harvest(opencolorio/lib opencolorio/lib "*.a")
+harvest(opencolorio/lib/static opencolorio/lib "*.a")
 harvest(openexr/include openexr/include "*.h")
 harvest(openexr/lib openexr/lib "*.a")
 harvest(openimageio/bin openimageio/bin "idiff")
@@ -168,7 +168,7 @@ harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
-harvest(openvdb/include/openvdb/openvdb openvdb/include/openvdb "*.h")
+harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
 harvest(osl/bin osl/bin "oslc")
 harvest(osl/include osl/include "*.h")
index f3d7c2b4c7be78f03e7fc507f6be4c3607ceba9a..a99b1f118cb2f155ed3f0197ca6945fb7639b128 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(OPENCOLORIO_EXTRA_ARGS
-       -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-       -DBoost_USE_MULTITHREADED=ON
-       -DBoost_USE_STATIC_LIBS=ON
-       -DBoost_USE_STATIC_RUNTIME=ON
-       -DBOOST_ROOT=${LIBDIR}/boost
-       -DBOOST_INCLUDEDIR=${LIBDIR}/boost/include/boost_1_68/boost
-       -DBoost_NO_SYSTEM_PATHS=ON
-       -DBoost_DEBUG=ON
-       -DBoost_MAJOR_VERSION=1
-       -DBoost_MINOR_VERSION=60
        -DOCIO_BUILD_APPS=OFF
        -DOCIO_BUILD_PYGLUE=OFF
        -DOCIO_BUILD_NUKE=OFF
+       -DOCIO_USE_BOOST_PTR=OFF
+       -DOCIO_BUILD_STATIC=ON
+       -DOCIO_BUILD_SHARED=OFF
+       -DOCIO_BUILD_TRUELIGHT=OFF
+       -DOCIO_BUILD_DOCS=OFF
+       -DOCIO_BUILD_PYGLUE=OFF
+       -DOCIO_BUILD_JNIGLUE=OFF
+       -DOCIO_STATIC_JNIGLUE=OFF
 )
 
 if(WIN32)
        set(OCIO_PATCH opencolorio_win.diff)
        set(OPENCOLORIO_EXTRA_ARGS
                ${OPENCOLORIO_EXTRA_ARGS}
-               -DOCIO_BUILD_SHARED=OFF
-               -DOCIO_BUILD_STATIC=ON
-               -DOCIO_BUILD_TRUELIGHT=OFF
-               -DOCIO_BUILD_APPS=OFF
-               -DOCIO_BUILD_NUKE=OFF
-               -DOCIO_BUILD_DOCS=OFF
                -DOCIO_BUILD_TESTS=OFF
-               -DOCIO_BUILD_PYGLUE=OFF
-               -DOCIO_BUILD_JNIGLUE=OFF
-               -DOCIO_STATIC_JNIGLUE=OFF
                -DOCIO_USE_SSE=ON
                -DOCIO_INLINES_HIDDEN=OFF
-               -DOCIO_USE_BOOST_PTR=OFF
                -DOCIO_PYGLUE_LINK=OFF
                -DOCIO_PYGLUE_RESPECT_ABI=OFF
                -DOCIO_PYGLUE_SONAME=OFF
@@ -62,14 +50,13 @@ if(WIN32)
                -DUSE_EXTERNAL_LCMS=ON
                -DINC_1=${LIBDIR}/tinyxml/include
                -DINC_2=${LIBDIR}/yamlcpp/include
+               #lie because ocio cmake is demanding boost even though it is not needed 
+               -DYAML_CPP_VERSION=0.5.0
        )
 else()
        set(OCIO_PATCH opencolorio.diff)
        set(OPENCOLORIO_EXTRA_ARGS
                ${OPENCOLORIO_EXTRA_ARGS}
-               -DOCIO_USE_BOOST_PTR=OFF
-               -DOCIO_BUILD_STATIC=ON
-               -DOCIO_BUILD_SHARED=OFF
        )
 endif()
 
@@ -102,6 +89,7 @@ if(WIN32)
                external_opencolorio
                external_tinyxml
                external_yamlcpp
+               
        )
        if(BUILD_MODE STREQUAL Release)
                ExternalProject_Add_Step(external_opencolorio after_install
index 2aa167a4be5c8eac3026c73b95f9ebef5054b0bd..f9e414a27314fd67a0f138cab648a0accfd61f10 100644 (file)
@@ -31,6 +31,16 @@ if(WIN32)
                -DOPENEXR_BUILD_TESTS=Off
                -DOPENEXR_BUILD_VIEWERS=Off
                -DOPENEXR_BUILD_UTILS=Off
+               #yaml-cpp > 0.5.0 requires boost.
+               -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+               -DBoost_USE_MULTITHREADED=ON
+               -DUSE_STATIC_BOOST=On
+               -DBoost_USE_STATIC_LIBS=ON
+               -DBoost_USE_STATIC_RUNTIME=ON
+               -DBoost_DEBUG=ON
+               -DBOOST_ROOT=${LIBDIR}/boost
+               -DBoost_NO_SYSTEM_PATHS=ON
+               -DOCIO_USE_BOOST_PTR=On
        )
        ExternalProject_Add(external_openexr
                URL ${OPENEXR_URI}
@@ -43,6 +53,8 @@ if(WIN32)
        
        ExternalProject_Add_Step(external_openexr after_install
                COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
+               #libs have moved between versions, just duplicate it for now. 
+               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/ilmbase/lib
                COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include 
                DEPENDEES install
        )
index 5e7449fe07945d13ff1879c8f6d85af0db5ad8ea..73d1f4a78712d1ee68c695f2550b610269d9f830 100644 (file)
@@ -65,7 +65,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
        -DBUILDSTATIC=ON
        ${OPENIMAGEIO_LINKSTATIC}
        -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
-       -DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf-2_2${LIBEXT}
+       -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
@@ -109,12 +109,12 @@ 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_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-       -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-       -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${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}
        -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-       -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
+       -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
        -DSTOP_ON_WARNING=OFF
        ${WEBP_FLAGS}
        ${OIIO_SIMD_FLAGS}
@@ -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
 )
index 3418987a46b5b9b1fdd1aa2101a484eca6ba19e5..69dff9b2b5750e6be88d7a65555539f807b6b8f2 100644 (file)
@@ -32,8 +32,7 @@ set(OPENVDB_EXTRA_ARGS
        -DWITH_BLOSC=ON
        -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
        -DBLOSC_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-       -DOPENVDB_ABI_VERSION_NUMBER=3
-       -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=Off
+       -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
        -DOPENVDB_BUILD_UNITTESTS=Off
        -DOPENVDB_BUILD_PYTHON_MODULE=Off
        -DGLEW_LOCATION=${LIBDIR}/glew/
@@ -41,13 +40,13 @@ set(OPENVDB_EXTRA_ARGS
        -DTBB_LOCATION=${LIBDIR}/tbb/
        -DTBB_ROOT=${LIBDIR}/tbb/
        -DOPENEXR_LOCATION=${LIBDIR}/openexr
-       -DILMBASE_LOCATION=${LIBDIR}/openexr
-       -DIlmbase_HALF_LIBRARY=${LIBDIR}/openexr/lib/Half-2_3_s${LIBEXT}
-       -DIlmbase_IEX_LIBRARY=${LIBDIR}/openexr/lib/Iex-2_3_s${LIBEXT}
-       -DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/IlmThread-2_3_s${LIBEXT}
-       -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/IlmImf-2_3_s${LIBEXT}
+       -DILMBASE_LOCATION=${LIBDIR}/ilmbase
+       -DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
        -DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
-       -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/tbb_static${LIBEXT}
+       -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
        -DTBB_LIBRARY_DIR=${LIBDIR}/tbb/lib
        -DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
 )
index ad4d0ee6038e0638f8a647f44e99a2a2e5ad3e49..add92a2fc0bc9aaf7c36161d0ca8f66a415f908c 100644 (file)
@@ -19,7 +19,7 @@
 if(WIN32)
        set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
        set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
-       set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
+       set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
                set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
        else()
@@ -28,11 +28,11 @@ if(WIN32)
 else()
        set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
        set(OSL_FLEX_BISON)
-       set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
+       set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
 endif()
 
-set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath-2_2.lib^^${LIBDIR}/ilmbase/lib/Half.lib^^${LIBDIR}/ilmbase/lib/IlmThread-2_2.lib^^${LIBDIR}/ilmbase/lib/Iex-2_2.lib")
-set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/LLVMipo${LIBEXT}")
+set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Half{ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/IlmThread${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Iex${ILMBASE_VERSION_POSTFIX}.lib")
+set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
 
 set(OSL_EXTRA_ARGS
        -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
@@ -50,11 +50,12 @@ set(OSL_EXTRA_ARGS
        -DOPENEXR_HOME=${LIBDIR}/openexr/
        -DILMBASE_HOME=${LIBDIR}/ilmbase/
        -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-       -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-       -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-       -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${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}
        -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-       -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
+       -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
        -DOSL_BUILD_TESTS=OFF
        -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
        -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
@@ -64,12 +65,15 @@ set(OSL_EXTRA_ARGS
        ${OSL_FLEX_BISON}
        -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
        -DBUILDSTATIC=ON
-       -DLINKSTATIC=ON
+       # Don't use because it statically links pthreads, same as OIIO.
+       # -DLINKSTATIC=ON
        -DOSL_BUILD_PLUGINS=Off
        -DSTOP_ON_WARNING=OFF
-       -DOSL_BUILD_CPP11=ON
        -DUSE_LLVM_BITCODE=OFF
+       -DUSE_PARTIO=OFF
        ${OSL_SIMD_FLAGS}
+       -DPUGIXML_HOME=${LIBDIR}/pugixml
+       -DPARTIO_LIBRARIES=
 )
 
 ExternalProject_Add(external_osl
@@ -78,9 +82,8 @@ ExternalProject_Add(external_osl
        LIST_SEPARATOR ^^
        URL_HASH MD5=${OSL_HASH}
        PREFIX ${BUILD_DIR}/osl
-       PATCH_COMMAND
-               ${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff &&
-               ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
+       PATCH_COMMAND ${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff 
+       #       ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
        INSTALL_DIR ${LIBDIR}/osl
 )
@@ -95,4 +98,5 @@ add_dependencies(
        external_zlib
        external_flexbison
        external_openimageio
+       external_pugixml
 )
diff --git a/build_files/build_environment/cmake/pugixml.cmake b/build_files/build_environment/cmake/pugixml.cmake
new file mode 100644 (file)
index 0000000..bb1cb98
--- /dev/null
@@ -0,0 +1,36 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(PUGIXML_EXTRA_ARGS
+)
+
+ExternalProject_Add(external_pugixml
+       URL ${PUGIXML_URI}
+       DOWNLOAD_DIR ${DOWNLOAD_DIR}
+       URL_HASH MD5=${PUGIXML_HASH}
+       PREFIX ${BUILD_DIR}/pugixml
+       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
+       INSTALL_DIR ${LIBDIR}/pugixml
+)
+
+#if(BUILD_MODE STREQUAL Release AND WIN32)
+       #ExternalProject_Add_Step(external_freetype after_install
+       #       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
+       #       DEPENDEES install
+       #)
+#endif()
index 7de498bc12682fbe575e83ef6b2fdb86f4915333..95c32be8335aa20cbe7d5b5a0eb8727a99502f26 100644 (file)
@@ -132,10 +132,14 @@ if(MSVC)
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
                COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
-               COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
+               #xxlimited is an example extention module, we don't need to ship it and debug doesn't build it
+               #leaving it commented out, so I won't get confused again with the next update. 
+               #COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
+               COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1-x64.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1-x64.dll
+               COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libcrypto-1_1-x64.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libcrypto-1_1-x64.dll
                COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
                COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ 
-               COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz 
+               COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz 
        )
 
        add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
index fea05cbc492e1316ad3c6f0218167b4cf734cf41..18217f6c446a5405f7da87fc44bface3d341731c 100644 (file)
@@ -46,14 +46,21 @@ set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS
 set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551)
 
 set(ILMBASE_VERSION 2.3.0)
+if (WIN32)
+       set(ILMBASE_VERSION_POSTFIX -2_3_s)
+else()
+       set(ILMBASE_VERSION_POSTFIX)
+endif()
 set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_VERSION}/ilmbase-${ILMBASE_VERSION}.tar.gz)
 set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860)
 
 set(OPENEXR_VERSION 2.3.0)
 if (WIN32) #release 2.3.0 tarball has broken cmake support
+       set(OPENEXR_VERSION_POSTFIX -2_3_s)
        set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
        set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
 else()
+       set(OPENEXR_VERSION_POSTFIX)
        set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
        set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
 endif()
@@ -119,26 +126,17 @@ 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)
 set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)
 
-set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
-set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-
-set(OSL_VERSION 1.7.5)
-set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip)
-set(OSL_HASH 6924dd5d453159e7b6eb106a08c358cf)
+set(OSL_VERSION 1.9.9)
+set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
+set(OSL_HASH 44ad511e424965a10fce051a053b0605)
 
 set(PYTHON_VERSION 3.7.0)
 set(PYTHON_SHORT_VERSION 3.7)
@@ -154,11 +152,11 @@ set(OPENVDB_VERSION 5.1.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
 set(OPENVDB_HASH 5310101f874dcfd2165f9cee68c22624)
 
-set(IDNA_VERSION 2.6)
-set(CHARDET_VERSION 3.0.2)
-set(URLLIB3_VERSION 1.22)
-set(CERTIFI_VERSION 2017.7.27.1)
-set(REQUESTS_VERSION 2.18.4)
+set(IDNA_VERSION 2.7)
+set(CHARDET_VERSION 3.0.4)
+set(URLLIB3_VERSION 1.23)
+set(CERTIFI_VERSION 2018.8.13)
+set(REQUESTS_VERSION 2.19.1)
 
 set(NUMPY_VERSION v1.15.0)
 set(NUMPY_SHORT_VERSION 1.15)
@@ -264,5 +262,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)
+
 
 
index 0c91b4151fe22e0a9ca3688999f8aea9b19600d3..48a5008f356a8e256903d3407bbb72e0ad6444fb 100644 (file)
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3fc9be5..5112ce6 100644
+index 95abbe2..4f14f30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -254,11 +254,11 @@
+@@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME)
  endif()\r
  \r
  #adding PCRE\r
@@ -16,10 +16,10 @@ index 3fc9be5..5112ce6 100644
                message("WARNING: Native PCRE not found, taking PCRE from ./Externals")\r
                add_definitions(-DPCRE_STATIC)\r
                add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)\r
-diff --git a/DAEValidator/library/include/no_warning_begin.orig b/DAEValidator/library/include/no_warning_begin
-index 3fc9be5..5112ce6 100644
---- a/DAEValidator/library/include/no_warning_begin.orig       2017-05-31 16:56:39 -0600
-+++ b/DAEValidator/library/include/no_warning_begin    2017-06-07 10:18:45 -0600
+diff --git a/DAEValidator/library/include/no_warning_begin b/DAEValidator/library/include/no_warning_begin
+index 7a69c32..defb315 100644
+--- a/DAEValidator/library/include/no_warning_begin
++++ b/DAEValidator/library/include/no_warning_begin
 @@ -2,6 +2,9 @@
  #if defined(_WIN32)
  #     pragma warning(push)
@@ -30,3 +30,16 @@ index 3fc9be5..5112ce6 100644
  #     if defined(_MSC_VER) && defined(_DEBUG)
  #             pragma warning(disable:4548)
  #     endif
+diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
+index 1f9a3ee..d151e9a 100644
+--- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
++++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
+@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser
+ #if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__)
+         return _isnan( value ) ? true : false;
+ #else
+-#ifdef isnan
++#if defined(isnan) || defined(__APPLE__)
+         return isnan( value );
+ #else
+         return std::isnan(value);
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 (file)
index 0000000..ca3d913
--- /dev/null
@@ -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 (file)
index e1f0f47..0000000
+++ /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 ()
index 51d587b5a22aa81c3bbc41090db85e2a5c7b7511..5d4c26c95271172bf37e8c7f18c02f7783411826 100644 (file)
@@ -16,7 +16,7 @@ diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
    )
  
 +if(NOT WIN32)
-+      set(EXTRA_LIBS m stdc++)
++      set(EXTRA_LIBS m stdc++ dl)
 +endif()
 +  
  TARGET_LINK_LIBRARIES ( vdb_print
@@ -41,6 +41,15 @@ diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
    )
  
  SET ( VDB_VIEW_SOURCE_FILES
+@@ -270,7 +270,7 @@
+   PROPERTIES
+   COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1"
+   )
+-IF (NOT WIN32)
++IF (FALSE)
+   ADD_EXECUTABLE ( vdb_view
+     ${VDB_VIEW_SOURCE_FILES}
+     )
 @@ -283,9 +288,8 @@
      ${GLFW_LINK_LIBRARY}
      ${GLFW_DEPENDENT_LIBRARIES}
@@ -63,6 +72,15 @@ diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
      )
  
    ADD_TEST ( vdb_unit_test vdb_test )
+@@ -422,7 +422,7 @@
+ ENDIF ()
+ # Installation
+-IF ( NOT WIN32 )
++IF ( FALSE )
+   INSTALL ( TARGETS
+     vdb_view
+     DESTINATION
 diff -Naur openvdb.orig/openvdb/math/Coord.h openvdb/openvdb/math/Coord.h
 --- openvdb.orig/openvdb/math/Coord.h  2018-04-10 12:22:17 -0600
 +++ openvdb/openvdb/math/Coord.h       2018-08-15 20:32:43 -0600
index ccf34d99699205736e2752aceb45176c47efaf21..fcb5ec4165fd40085e4035fb3a935a121e7f8b73 100644 (file)
@@ -10,29 +10,3 @@ diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_o
            MAIN_DEPENDENCY ${flexsrc}
            DEPENDS ${${compiler_headers}}
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
---- osl/src/external_osl/src/include/OSL/oslconfig.h   2016-10-31 16:48:19 -0600
-+++ osl/src/external_osl/src/include/OSL/oslconfig.h   2018-05-27 11:18:08 -0600
-@@ -44,12 +44,18 @@
- // same if another packages is compiling against OSL and using these headers
- // (OSL may be C++11 but the client package may be older, or vice versa --
- // use these two symbols to differentiate these cases, when important).
--#if (__cplusplus >= 201402L)
--#  define OSL_CPLUSPLUS_VERSION  14
--#elif (__cplusplus >= 201103L)
--#  define OSL_CPLUSPLUS_VERSION  11
-+
-+// Force C++03 for MSVC in blender since svn the libraries are build with that
-+#if !defined(_MSC_VER)
-+      #if (__cplusplus >= 201402L)
-+      #  define OSL_CPLUSPLUS_VERSION  14
-+      #elif (__cplusplus >= 201103L)
-+      #  define OSL_CPLUSPLUS_VERSION  11
-+      #else
-+      #  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
-+      #endif
- #else
--#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
-+      #  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
- #endif
- // Symbol export defines
index 32a2d6958958bf45642dde0cafb9758833c43ef2..8c11e93e81a0281804b78044ae7645c64caf0cd0 100644 (file)
@@ -353,16 +353,19 @@ if(WITH_OPENCOLORIO)
 endif()
 
 if(WITH_LLVM)
-       # Symbol conflicts with same UTF library used by OpenCollada
        if(EXISTS ${LIBDIR})
                set(LLVM_STATIC ON)
-               if(WITH_OPENCOLLADA)
-                       list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY})
-               endif()
        endif()
 
        find_package_wrapper(LLVM)
 
+       # Symbol conflicts with same UTF library used by OpenCollada
+       if(EXISTS ${LIBDIR})
+               if(WITH_OPENCOLLADA AND (${LLVM_VERSION} VERSION_LESS "4.0.0"))
+                       list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY})
+               endif()
+       endif()
+
        if(NOT LLVM_FOUND)
                set(WITH_LLVM OFF)
                message(STATUS "LLVM not found")
index 47933ff4b43f773373524c95461be604272bdeb0..f45c888edf6630056fd309c323aa00d08a2c9d34 100644 (file)
@@ -619,6 +619,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
        RNA_def_boolean(func, "use_spherical_stereo", 0, "Spherical Stereo", "");
        parm = RNA_def_float_matrix(func, "r_model_matrix", 4, 4, NULL, 0.0f, 0.0f, "Model Matrix", "Normalized camera model matrix", 0.0f, 0.0f);
        RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+       RNA_def_function_output(func, parm);
 
        func = RNA_def_function(srna, "use_spherical_stereo", "RE_engine_get_spherical_stereo");
        parm = RNA_def_pointer(func, "camera", "Object", "", "");