Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'build_files')
-rw-r--r--build_files/build_environment/cmake/freetype.cmake1
-rw-r--r--build_files/build_environment/cmake/versions.cmake4
-rw-r--r--build_files/build_environment/patches/freetype.diff18
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