diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake index 47f526e..d67574d 100644 --- a/build_files/build_environment/cmake/jpeg.cmake +++ b/build_files/build_environment/cmake/jpeg.cmake @@ -18,7 +18,10 @@ if(WIN32) # cmake for windows - set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON -DCMAKE_DEBUG_POSTFIX=d) + set(JPEG_EXTRA_ARGS + -DNASM=${NASM_PATH} + -DWITH_JPEG8=ON + -DCMAKE_DEBUG_POSTFIX=d) ExternalProject_Add(external_jpeg URL ${JPEG_URI} @@ -42,20 +45,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/openal.cmake b/build_files/build_environment/cmake/openal.cmake index 44f6cdf..315f2e8 100644 --- a/build_files/build_environment/cmake/openal.cmake +++ b/build_files/build_environment/cmake/openal.cmake @@ -52,7 +52,6 @@ if(BUILD_MODE STREQUAL Release) PREFIX ${BUILD_DIR}/openal CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openal - PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff ) if(WIN32) diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index 27e04a1..0d5b8a4 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -45,6 +45,7 @@ if(WITH_WEBP) -DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT} ) set(WEBP_DEP external_webp) +else() endif() if(MSVC) @@ -57,12 +58,12 @@ if(MSVC) else() set(OPENJPEG_FLAGS -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION} - -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY} + -DOPENJPEG_LIBRARIES=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY} ) 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} @@ -76,21 +77,18 @@ set(OPENIMAGEIO_EXTRA_ARGS -OIIO_BUILD_CPP11=ON -DUSE_OPENGL=OFF -DUSE_TBB=OFF - -DUSE_FIELD3D=OFF + -DENABLE_FIELD3D=OFF -DUSE_QT=OFF -DUSE_PYTHON=OFF - -DUSE_GIF=OFF + -DENABLE_GIF=OFF -DUSE_OPENCV=OFF - -DUSE_OPENSSL=OFF -DUSE_OPENJPEG=ON - -DUSE_FFMPEG=OFF - -DUSE_PTEX=OFF + -DENABLE_FFMPEG=OFF + -DENABLE_PTEX=OFF -DUSE_FREETYPE=OFF - -DUSE_LIBRAW=OFF - -DUSE_PYTHON=OFF - -DUSE_PYTHON3=OFF - -DUSE_OCIO=OFF - -DUSE_WEBP=${WITH_WEBP} + -DENABLE_LIBRAW=OFF + -DUSE_OPENCOLORIO=OFF + -DENABLE_WEBP=${WITH_WEBP} -DOIIO_BUILD_TOOLS=${OIIO_TOOLS} -DOIIO_BUILD_TESTS=OFF -DBUILD_TESTING=OFF @@ -103,7 +101,6 @@ 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/ diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index d1e729a..dd0e61b 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -20,17 +20,17 @@ set(ZLIB_VERSION 1.2.11) set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz) set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e) -set(OPENAL_VERSION 1.18.2) +set(OPENAL_VERSION 1.19.1) set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2) -set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190) +set(OPENAL_HASH af6f148c342276a51ea9c33ebd303f78) -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 015e8e15db1eecde5f2eb9eb5b6e59e9) -set(JPEG_VERSION 1.5.3) +set(JPEG_VERSION 2.0.3) set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz) -set(JPEG_HASH 5b7549d440b86c98a517355c102d155e) +set(JPEG_HASH 46f1c49a9a5d4c1a6bfe8371de030087) set(BOOST_VERSION 1.70.0) set(BOOST_VERSION_NODOTS 1_70_0) @@ -70,11 +70,11 @@ set(FREETYPE_VERSION 2.10.1) set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz) set(FREETYPE_HASH c50a3c9e5e62bdc938a6e1598a782947) -set(GLEW_VERSION 1.13.0) +set(GLEW_VERSION 2.1.0) set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz) -set(GLEW_HASH 7cbada3166d2aadfc4169c4283701066) +set(GLEW_HASH b2ab12331033ddfaa50dc39345343980) -set(FREEGLUT_VERSION 3.0.0) +set(FREEGLUT_VERSION 3.2.1) set(FREEGLUT_URI http://pilotfiber.dl.sourceforge.net/project/freeglut/freeglut/${FREEGLUT_VERSION}/freeglut-${FREEGLUT_VERSION}.tar.gz) set(FREEGLUT_HASH 90c3ca4dd9d51cf32276bc5344ec9754) @@ -105,17 +105,17 @@ set(OPENSUBDIV_VERSION v3_4_0_RC2) set(OPENSUBDIV_Hash f6a10ba9efaa82fde86fe65aad346319) set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz) -set(SDL_VERSION 2.0.8) +set(SDL_VERSION 2.0.10) set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz) -set(SDL_HASH 3800d705cef742c6a634f202c37f263f) +set(SDL_HASH 5a2114f2a6f348bdab5bf52b994811db) 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_VERSION 1.1.1) set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz) -set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8) +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,13 +127,13 @@ 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.10.1) set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz) -set(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93) +set(OPENIMAGEIO_HASH 5c149cd6e21ec523a83127b69cc780c6) -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_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz) @@ -180,13 +180,13 @@ set(THEORA_VERSION 1.1.1) set(THEORA_URI http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2) set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc) -set(FLAC_VERSION 1.3.2) +set(FLAC_VERSION 1.3.3) set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz) -set(FLAC_HASH 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f) +set(FLAC_HASH 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748) -set(VPX_VERSION 1.7.0) +set(VPX_VERSION 1.8.1) set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz) -set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238) +set(VPX_HASH df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e) set(OPUS_VERSION 1.3.1) set(OPUS_URI https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz) @@ -200,7 +200,7 @@ set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0) # 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) @@ -210,9 +210,9 @@ set(FAAD_VERSION 2-2.8.8) set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz) set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f) -set(FFMPEG_VERSION 4.0.2) +set(FFMPEG_VERSION 4.2.1) set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2) -set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb) +set(FFMPEG_HASH f3cba622990c8ac8a57330f571db1230) set(FFTW_VERSION 3.3.8) set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz) @@ -238,7 +238,7 @@ set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5) set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip) set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb) -set(WEBP_VERSION 0.6.1) +set(WEBP_VERSION 1.0.3) set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz) set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72) @@ -246,9 +246,9 @@ set(SPNAV_VERSION 0.2.3) set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz) set(SPNAV_HASH 44d840540d53326d4a119c0f1aa7bf0a) -set(JEMALLOC_VERSION 5.0.1) +set(JEMALLOC_VERSION 5.2.1) set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2) -set(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f) +set(JEMALLOC_HASH 3d41fbf006e6ebffd489bdb304d009ae) set(XML2_VERSION 2.9.4) set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz) @@ -291,13 +291,13 @@ set(LZMA_VERSION 5.2.4) set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2) set(LZMA_HASH 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf) -set(SSL_VERSION 1.1.0i) +set(SSL_VERSION 1.1.0l) set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz) -set(SSL_HASH ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99) +set(SSL_HASH 74a2f756c64fd7386a29184dc0344f4831192d61dc2481a93a4c5dd727f41148) -set(SQLITE_VERSION 3.24.0) -set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip) -set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7) +set(SQLITE_VERSION 3.30.1) +set(SQLITE_URI https://www.sqlite.org/2019/sqlite-src-3300100.zip) +set(SQLITE_HASH 3dec734206fab0cdceb421021964ff7e3fedf3b0) set(EMBREE_VERSION 3.8.0) set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip) @@ -307,9 +307,9 @@ set(USD_VERSION 19.11) set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz) set(USD_HASH 79ff176167b3fe85f4953abd6cc5e0cc) -set(OIDN_VERSION 1.0.0) +set(OIDN_VERSION 1.1.0) set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip) -set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60) +set(OIDN_HASH 04396611ebabccb3685c5d7acec4a612) set(LIBGLU_VERSION 9.0.1) set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz) diff --git a/build_files/build_environment/patches/openal.diff b/build_files/build_environment/patches/openal.diff deleted file mode 100644 index 2c9862b..0000000 --- a/build_files/build_environment/patches/openal.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur external_openal_original/CMakeLists.txt external_openal/CMakeLists.txt ---- external_openal_original/CMakeLists.txt 2016-01-24 20:12:39 -0700 -+++ external_openal/CMakeLists.txt 2018-06-02 12:16:52 -0600 -@@ -885,7 +885,8 @@ - OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF) - IF(HAVE_WINDOWS_H) - # Check MMSystem backend -- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502) -+ set(CMAKE_REQUIRED_FLAGS "-D_WIN32_WINNT=0x0502") -+ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H) - IF(HAVE_MMSYSTEM_H) - CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM) - IF(HAVE_LIBWINMM) diff --git a/build_files/build_environment/patches/openimagedenoise.diff b/build_files/build_environment/patches/openimagedenoise.diff index 7bfc3aa..031f056 100644 --- a/build_files/build_environment/patches/openimagedenoise.diff +++ b/build_files/build_environment/patches/openimagedenoise.diff @@ -95,10 +95,10 @@ diff '--ignore-matching-lines=:' -ur '--exclude=*.svn*' -u -r # Build as shared or static library -if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0") -- option(OIDN_STATIC_LIB "Build Open Image Denoise as a static library.") +- option(OIDN_STATIC_LIB "Build Intel(R) Open Image Denoise as a static library.") - mark_as_advanced(CLEAR OIDN_STATIC_LIB) -else() -- set(OIDN_STATIC_LIB OFF CACHE BOOL "Build Open Image Denoise as a static library." FORCE) +- set(OIDN_STATIC_LIB OFF CACHE BOOL "Build Intel(R) Open Image Denoise as a static library." FORCE) - mark_as_advanced(OIDN_STATIC_LIB) -endif() +option(OIDN_STATIC_LIB "Build Open Image Denoise as a static library.") diff --git a/build_files/build_environment/patches/openimageio_gdi.diff b/build_files/build_environment/patches/openimageio_gdi.diff index af0c906..6cf7571 100644 --- a/build_files/build_environment/patches/openimageio_gdi.diff +++ b/build_files/build_environment/patches/openimageio_gdi.diff @@ -1,26 +1,14 @@ -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 - #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 + # ifndef NOMINMAX + # define NOMINMAX + # endif ++# ifndef NOGDI ++# define NOGDI ++# endif + # include #endif diff --git a/build_files/build_environment/patches/openimageio_static_libs.diff b/build_files/build_environment/patches/openimageio_static_libs.diff index 6a2e58b..2501e49 100644 --- a/build_files/build_environment/patches/openimageio_static_libs.diff +++ b/build_files/build_environment/patches/openimageio_static_libs.diff @@ -12,11 +12,11 @@ diff -Naur external_openimageio.orig/src/cmake/compiler.cmake external_openimage --- 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) + 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 ()