Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 13 Aug 2018 15:49:19 +0000 (17:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 13 Aug 2018 15:49:19 +0000 (17:49 +0200)
17 files changed:
build_files/build_environment/cmake/faad.cmake
build_files/build_environment/cmake/ffmpeg.cmake
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/ilmbase.cmake
build_files/build_environment/cmake/lame.cmake
build_files/build_environment/cmake/openexr.cmake
build_files/build_environment/cmake/openjpeg.cmake
build_files/build_environment/cmake/setup_mingw32.cmake
build_files/build_environment/cmake/setup_mingw64.cmake
build_files/build_environment/cmake/versions.cmake
build_files/build_environment/cmake/vpx.cmake
build_files/build_environment/cmake/x264.cmake
build_files/build_environment/patches/ffmpeg.diff [deleted file]
build_files/build_environment/patches/libfaad.diff [deleted file]
build_files/build_environment/patches/openexr.diff [deleted file]
build_files/build_environment/patches/x264.diff [new file with mode: 0644]
source/blender/editors/mesh/editmesh_path.c

index 3dd90971b84dbf941fac2feacf700c2098a29f7d..df940c423a350ee8cc15075cfd45f68cbd271a2d 100644 (file)
 
 set(FAAD_EXTRA_ARGS)
 
+if (WIN32)
+       set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
+else()
+       set(FAAD_EXTRA_CONFIGURE echo .)
+endif()
+
 ExternalProject_Add(external_faad
        URL ${FAAD_URI}
        DOWNLOAD_DIR ${DOWNLOAD_DIR}
        URL_HASH MD5=${FAAD_HASH}
        PREFIX ${BUILD_DIR}/faad
-       PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/faad/src/external_faad < ${PATCH_DIR}/libfaad.diff
-       CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
+       CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
        BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
        INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
        INSTALL_DIR ${LIBDIR}/faad
index 42504e8120b000924b10881be255323bea7c314f..c8fdb5579833ac7db91cbd3d0f91ad767b2b648a 100644 (file)
@@ -18,8 +18,8 @@
 
 set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include")
 set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib")
-set(FFMPEG_EXTRA_FLAGS --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR})
+set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
+set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
        set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
@@ -91,7 +91,6 @@ ExternalProject_Add(external_ffmpeg
                --disable-indev=qtkit
                --disable-sdl2
                --disable-gnutls
-               --disable-vda
                --disable-videotoolbox
                --disable-libxcb
                --disable-xlib
@@ -102,7 +101,6 @@ ExternalProject_Add(external_ffmpeg
                --disable-indev=alsa
                --disable-outdev=alsa
                --disable-crystalhd
-       PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
        BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
        INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
@@ -132,3 +130,13 @@ if(WIN32)
                external_zlib_mingw
        )
 endif()
+
+if(BUILD_MODE STREQUAL Release AND WIN32)
+       ExternalProject_Add_Step(external_ffmpeg after_install
+               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
+               COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
+               DEPENDEES install
+       )
+endif()
+
+
index 277e414a7d9afa07a0ebc035aa23a04cb1b231b7..ece9716686fa11645527c21f438a65e3c601668e 100644 (file)
@@ -34,9 +34,6 @@ if(BUILD_MODE STREQUAL Release)
                                # pthreads, rename include dir
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ &&
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib &&
-                               # ffmpeg copy include+bin
-                               ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include &&
-                               ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib &&
                                # sdl merge bin/lib folder, copy include
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include &&
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib &&
index 0639848346f47b35a845ded8b8b6127bf97caecd..d03485b0a1e6a1cac1888cd52e8da6daba92c2b3 100644 (file)
 
 if(WIN32)
        set(ILMBASE_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}")
-endif()
-
-set(ILMBASE_EXTRA_ARGS
-       -DBUILD_SHARED_LIBS=OFF
-       -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
-)
-
-ExternalProject_Add(external_ilmbase
-       URL ${ILMBASE_URI}
-       DOWNLOAD_DIR ${DOWNLOAD_DIR}
-       URL_HASH MD5=${ILMBASE_HASH}
-       PREFIX ${BUILD_DIR}/ilmbase
-       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
-       INSTALL_DIR ${LIBDIR}/openexr
-)
+       set(ILMBASE_EXTRA_ARGS
+               -DBUILD_SHARED_LIBS=OFF
+               -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+       )
+       ExternalProject_Add(external_ilmbase
+               URL ${ILMBASE_URI}
+               DOWNLOAD_DIR ${DOWNLOAD_DIR}
+               URL_HASH MD5=${ILMBASE_HASH}
+               PREFIX ${BUILD_DIR}/ilmbase
+               CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+               INSTALL_DIR ${LIBDIR}/openexr
+       )
+else()
+       set(ILMBASE_EXTRA_ARGS
+               --enable-static
+               --disable-shared
+               --enable-cxxstd=11
+       )
+       ExternalProject_Add(external_ilmbase
+               URL ${ILMBASE_URI}
+               DOWNLOAD_DIR ${DOWNLOAD_DIR}
+               URL_HASH MD5=${ILMBASE_HASH}
+               PREFIX ${BUILD_DIR}/ilmbase
+               CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
+               BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make -j${MAKE_THREADS}
+               INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
+               INSTALL_DIR ${LIBDIR}/openexr
+       )
+endif()
\ No newline at end of file
index a489b2302ce03748b240293a9686badd0633223d..b7b9275bf5ee0378fb0adb0527b1d895ebcc2f39 100644 (file)
@@ -36,7 +36,7 @@ ExternalProject_Add(external_lame
                --disable-mp3x
                --disable-mp3rtp
                --disable-gtktest
-               --enable-export=full
+               --disable-frontend
        BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
        INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
        INSTALL_DIR ${LIBDIR}/lame
index 36283951750f42f893255ac60e100b881cc561dd..e7222478090d41ac8ed37a9ebb5f5c5c1e29ff2e 100644 (file)
 
 if(WIN32)
        set(OPENEXR_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}")
-endif()
-
-set(OPENEXR_EXTRA_ARGS
-       -DBUILD_SHARED_LIBS=OFF
-       -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-       -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-       -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-       -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
-)
+       set(OPENEXR_EXTRA_ARGS
+               -DBUILD_SHARED_LIBS=OFF
+               -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
+               -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+               -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+               -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
+               -DOPENEXR_BUILD_STATIC=On
+               -DOPENEXR_BUILD_PYTHON_LIBS=Off
+       )
+       ExternalProject_Add(external_openexr
+               URL ${OPENEXR_URI}
+               DOWNLOAD_DIR ${DOWNLOAD_DIR}
+               URL_HASH MD5=${OPENEXR_HASH}
+               PREFIX ${BUILD_DIR}/openexr
+               CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+               INSTALL_DIR ${LIBDIR}/openexr
+       )
+else()
+       set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
+       set(OPENEXR_EXTRA_ARGS
+         --enable-static
+         --disable-shared
+         --enable-cxxstd=11
+         --with-ilmbase-prefix=${LIBDIR}/ilmbase
+         )
 
-ExternalProject_Add(external_openexr
-       URL ${OPENEXR_URI}
-       DOWNLOAD_DIR ${DOWNLOAD_DIR}
-       URL_HASH MD5=${OPENEXR_HASH}
-       PREFIX ${BUILD_DIR}/openexr
-       PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openexr/src/external_openexr < ${PATCH_DIR}/openexr.diff
-       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
-       INSTALL_DIR ${LIBDIR}/openexr
-)
+       ExternalProject_Add(external_openexr
+               URL ${OPENEXR_URI}
+               DOWNLOAD_DIR ${DOWNLOAD_DIR}
+               URL_HASH MD5=${OPENEXR_HASH}
+               PREFIX ${BUILD_DIR}/openexr
+               CONFIGURE_COMMAND ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${OPENEXR_PKG_CONFIG_PATH} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/openexr ${OPENEXR_EXTRA_ARGS}
+               BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make -j${MAKE_THREADS}
+               INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
+               INSTALL_DIR ${LIBDIR}/openexr
+       )
+endif()
 
 add_dependencies(
        external_openexr
index df30783de402775c704e371663f89a5201a3e5d0..ae320b788807bb397861ebc402c1fce89dd1cbfc 100644 (file)
@@ -22,7 +22,7 @@
 set(OPENJPEG_EXTRA_ARGS -DBUILD_SHARED_LIBS=OFF)
 
 if(WIN32)
-       set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles")
+       set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles" -DBUILD_PKGCONFIG_FILES=On)
 else()
        set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
 endif()
index b3df59f93c8acddb02490ce641712da3d13d1650..a3ffc36c8b98da0f0ea9ed7f3f79d9f555d59a34 100644 (file)
@@ -119,6 +119,15 @@ if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "$
        )
 endif()
 
+if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe"))
+       message("Installing mktemp")
+       execute_process(
+               COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
+               WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+       )
+endif()
+
+
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
index fbc0c91404c8cdf049b0337f752cb925ffeaf5ba..3ed020d373bdda5b503aff7dd9a02fa6bb981fe6 100644 (file)
@@ -35,9 +35,9 @@ message("mingw_LIBDIR = ${mingw_LIBDIR}")
 
 message("Checking for mingw64")
 # download ming64
-if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z")
+if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
        message("Downloading mingw64")
-       file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/rubenvb/gcc-4.8-release/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z" "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z")
+       file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.4/threads-win32/seh/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
 endif()
 
 # make mingw root directory
@@ -49,10 +49,10 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
 endif()
 
 # extract mingw64
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/mingw64env.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z"))
        message("Extracting mingw64")
        execute_process(
-               COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z
+               COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z
                WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
        )
 endif()
@@ -120,6 +120,14 @@ if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "$
        )
 endif()
 
+if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/mktemp.exe"))
+       message("Installing mktemp")
+       execute_process(
+               COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
+               WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
+       )
+endif()
+
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
index 27cd1d200e0105faf11d3a2abe896b19021bb804..447bf82bfb4aa1583777d23fb874d7cb18a26045 100644 (file)
@@ -45,13 +45,18 @@ set(PTHREADS_VERSION 2-9-1)
 set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz)
 set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551)
 
-set(ILMBASE_VERSION 2.2.1)
-set(ILMBASE_URI http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILMBASE_VERSION}.tar.gz)
-set(ILMBASE_HASH 7b86128b04f0541b6bb33633e299cb44)
-
-set(OPENEXR_VERSION 2.2.1)
-set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH 421815c32989e1b98fc4798ee754c433)
+set(ILMBASE_VERSION 2.3.0)
+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_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
+       set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
+else()
+       set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
+       set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
+endif()
 
 set(FREETYPE_VERSION 2.9.1)
 set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
@@ -166,36 +171,36 @@ set(NUMPY_SHORT_VERSION 1.15)
 set(NUMPY_URI https://files.pythonhosted.org/packages/3a/20/c81632328b1a4e1db65f45c0a1350a9c5341fd4bbb8ea66cdd98da56fe2e/numpy-1.15.0.zip)
 set(NUMPY_HASH 20e13185089011116a98e11c9bf8aa07)
 
-set(LAME_VERSION 3.99.5)
-set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz)
-set(LAME_HASH 84835b313d4a8b68f5349816d33e07ce)
+set(LAME_VERSION 3.100)
+set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
+set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
 
-set(OGG_VERSION 1.3.2)
+set(OGG_VERSION 1.3.3)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
-set(OGG_HASH e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692)
+set(OGG_HASH c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985)
 
-set(VORBIS_VERSION 1.3.5)
+set(VORBIS_VERSION 1.3.6)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
-set(VORBIS_HASH 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce)
+set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
 
 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.1)
+set(FLAC_VERSION 1.3.2)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c)
+set(FLAC_HASH 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f)
 
-set(VPX_VERSION 1.5.0)
-set(VPX_URI http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX_VERSION}.tar.bz2)
-set(VPX_HASH 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797)
+set(VPX_VERSION 1.7.0)
+set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
+set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238)
 
-set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160401-2245-stable.tar.bz2)
-set(X264_HASH 1e9a7b835e80313aade53a9b6ff353e099de3856bf5f30a4d8dfc91281f786f5)
+set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180811-2245-stable.tar.bz2)
+set(X264_HASH ae8a868a0e236a348b35d79f3ee80294b169d1195408b689f9851383661ed7aa)
 
-set(XVIDCORE_VERSION 1.3.4)
+set(XVIDCORE_VERSION 1.3.5)
 set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
-set(XVIDCORE_HASH 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f)
+set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0)
 
 #this has to be in sync with the version in blenders /extern folder
 set(OPENJPEG_VERSION 2.3.0)
@@ -204,13 +209,13 @@ set(OPENJPEG_SHORT_VERSION 2.3)
 set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
 set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)
 
-set(FAAD_VERSION 2-2.7)
-set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.bz2)
-set(FAAD_HASH 4c332fa23febc0e4648064685a3d4332)
+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 3.4.1)
+set(FFMPEG_VERSION 4.0.2)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH bbf3fcded80c33968c91bf323a744286)
+set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb)
 
 set(FFTW_VERSION 3.3.4)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
index 9d155be1c6cd10404ad2dea0c01bba021baf307a..8989262135ba5679385a538a700b693da7b55f6d 100644 (file)
@@ -18,9 +18,9 @@
 
 if(WIN32)
        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-               set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc)
+               set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
        else()
-               set(VPX_EXTRA_FLAGS --target=x86-win32-gcc)
+               set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
        endif()
 else()
        if(APPLE)
index f42015e43952bd99e332c2c49f56c53ec3d75cec..7d7b0758aaf75e37b7275d9107d1e107b409fd8a 100644 (file)
 
 if(WIN32)
        set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
+       set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
+else()
+       set(X264_PATCH_CMD echo .)
 endif()
 
+
 ExternalProject_Add(external_x264
        URL ${X264_URI}
        DOWNLOAD_DIR ${DOWNLOAD_DIR}
        URL_HASH SHA256=${X264_HASH}
        PREFIX ${BUILD_DIR}/x264
+       PATCH_COMMAND ${X264_PATCH_CMD}
        CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
                --enable-static
                --enable-pic
diff --git a/build_files/build_environment/patches/ffmpeg.diff b/build_files/build_environment/patches/ffmpeg.diff
deleted file mode 100644 (file)
index 6e92539..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure  2016-11-26 03:12:05.000000000 +0100
-+++ configure  2017-04-05 03:24:35.000000000 +0200
-@@ -5494,7 +5493,5 @@
- check_func  access
- check_func_headers stdlib.h arc4random
--check_func_headers time.h clock_gettime ||
--    { check_lib clock_gettime time.h clock_gettime -lrt && LIBRT="-lrt"; }
- check_func  fcntl
- check_func  fork
- check_func  gethrtime
diff --git a/build_files/build_environment/patches/libfaad.diff b/build_files/build_environment/patches/libfaad.diff
deleted file mode 100644 (file)
index 37605b2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- frontend/main.c    2008-09-22 11:55:09 -0600
-+++ frontend/main.c    2016-04-06 15:20:36 -0600
-@@ -31,7 +31,6 @@
- #ifdef _WIN32
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
--#define off_t __int64
- #else
- #include <time.h>
- #endif
diff --git a/build_files/build_environment/patches/openexr.diff b/build_files/build_environment/patches/openexr.diff
deleted file mode 100644 (file)
index ec18751..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- IlmImf/CMakeLists.txt 2014-08-10 06:23:56.000000000 +0200
-+++ IlmImf/CMakeLists.txt 2017-01-08 04:06:04.931723800 +0100
-@@ -8,8 +8,8 @@
- TARGET_LINK_LIBRARIES ( b44ExpLogTable
-   Half
--  Iex${ILMBASE_LIBSUFFIX}
-   IlmThread${ILMBASE_LIBSUFFIX}
-+  Iex${ILMBASE_LIBSUFFIX}
-   ${PTHREAD_LIB}
- )
-@@ -25,8 +25,8 @@
- TARGET_LINK_LIBRARIES ( dwaLookups
-   Half
--  Iex${ILMBASE_LIBSUFFIX}
-   IlmThread${ILMBASE_LIBSUFFIX}
-+  Iex${ILMBASE_LIBSUFFIX}
-   ${PTHREAD_LIB}
- )
-@@ -138,9 +138,9 @@
- TARGET_LINK_LIBRARIES ( IlmImf 
-   Half 
--  Iex${ILMBASE_LIBSUFFIX}
-   Imath${ILMBASE_LIBSUFFIX}
-   IlmThread${ILMBASE_LIBSUFFIX}
-+  Iex${ILMBASE_LIBSUFFIX}
-   ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
- )
diff --git a/build_files/build_environment/patches/x264.diff b/build_files/build_environment/patches/x264.diff
new file mode 100644 (file)
index 0000000..2f2e680
--- /dev/null
@@ -0,0 +1,22 @@
+--- x264-snapshot-20180811-2245-stable\configure       2018-08-11 14:45:05 -0600
++++ external_x264\configure    2018-08-11 23:51:35 -0600
+@@ -396,7 +396,7 @@
+ # list of all preprocessor HAVE values we can define
+ CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \
+              LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC INTEL_DISPATCHER \
+-             MSA MMAP WINRT VSX ARM_INLINE_ASM STRTOK_R BITDEPTH8 BITDEPTH10"
++             MSA MMAP WINRT VSX ARM_INLINE_ASM BITDEPTH8 BITDEPTH10"
+ # parse options
+@@ -1071,10 +1071,6 @@
+     define HAVE_LOG2F
+ fi
+-if cc_check 'string.h' '' 'strtok_r(0, 0, 0);' ; then
+-    define HAVE_STRTOK_R
+-fi
+-
+ if [ "$SYS" != "WINDOWS" ] && cpp_check "sys/mman.h unistd.h" "" "defined(MAP_PRIVATE)"; then
+     define HAVE_MMAP
+ fi
index 64d890a731434d0c0692338063681ab267624504..68157dab4e00a530ca3540e268ae3bd34c877bf2 100644 (file)
@@ -180,7 +180,8 @@ static void mouse_mesh_shortest_path_vert(
                        }
                } while ((node = node->next));
 
-               int depth = 1;
+               /* We need to start as if just *after* a 'skip' block... */
+               int depth = op_params->interval_params.skip;
                node = path;
                do {
                        if ((is_path_ordered == false) ||
@@ -369,7 +370,8 @@ static void mouse_mesh_shortest_path_edge(
                        }
                } while ((node = node->next));
 
-               int depth = 1;
+               /* We need to start as if just *after* a 'skip' block... */
+               int depth = op_params->interval_params.skip;
                node = path;
                do {
                        if ((is_path_ordered == false) ||
@@ -513,7 +515,8 @@ static void mouse_mesh_shortest_path_face(
                        }
                } while ((node = node->next));
 
-               int depth = 1;
+               /* We need to start as if just *after* a 'skip' block... */
+               int depth = op_params->interval_params.skip;
                node = path;
                do {
                        if ((is_path_ordered == false) ||