diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-09 00:23:28 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-09 00:23:28 +0300 |
| commit | 67d3613d1a625b04ba2d53f5a10870fdf5fcf024 (patch) | |
| tree | 3b8f1e5fc8f9a17a5053e2ba4f11612c82bfdc8f /build_files | |
| parent | 9ff3482af4a6335f0dca43f959848105f3979e61 (diff) | |
Build_environment: Freetype 2.10.1
Freeetype 2.9.1 tags dllexport on most of its functions so these
are now exported from the blender binary. (Same issue as D6563
which fixed it for USD)
Issue has already been fixed upstream so a simple version bump
fixes it.
This patch bumps freetype to 2.10.1
Differential Revision: https://developer.blender.org/D6645
Reviewers: brecht , sergey
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/freetype.cmake | 1 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
| -rw-r--r-- | build_files/build_environment/patches/freetype.diff | 18 |
3 files changed, 2 insertions, 21 deletions
diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake index f998c94706f..30dd2eed676 100644 --- a/build_files/build_environment/cmake/freetype.cmake +++ b/build_files/build_environment/cmake/freetype.cmake @@ -32,7 +32,6 @@ ExternalProject_Add(external_freetype URL_HASH MD5=${FREETYPE_HASH} PREFIX ${BUILD_DIR}/freetype CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS} - PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/freetype/src/external_freetype < ${PATCH_DIR}/freetype.diff INSTALL_DIR ${LIBDIR}/freetype ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 085c7b065ae..58c76b6e263 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -66,9 +66,9 @@ else() set(OPENEXR_VERSION_POSTFIX) endif() -set(FREETYPE_VERSION 2.9.1) +set(FREETYPE_VERSION 2.10.1) set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz) -set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056) +set(FREETYPE_HASH c50a3c9e5e62bdc938a6e1598a782947) set(GLEW_VERSION 1.13.0) set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz) diff --git a/build_files/build_environment/patches/freetype.diff b/build_files/build_environment/patches/freetype.diff deleted file mode 100644 index cf952234795..00000000000 --- a/build_files/build_environment/patches/freetype.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff -NaurBb b/CMakeLists.txt a/CMakeLists.txt ---- b/CMakeLists.txt 2018-05-01 12:45:46 -0600 -+++ a/CMakeLists.txt 2018-08-08 13:03:22 -0600 -@@ -229,9 +229,12 @@ - endif () - string(REPLACE "/undef " "#undef " - FTCONFIG_H "${FTCONFIG_H}") -- file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" -- "${FTCONFIG_H}") -+else() -+ file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h" -+ FTCONFIG_H) - endif () -+file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h" -+ "${FTCONFIG_H}") - - - # Create the options file |