From b2e43a4a9db37757ab436ea68f229c0801441ba3 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 4 Feb 2022 09:19:10 -0700 Subject: deps_builder: Update to freetype 2.11.1 Required to solve a crash on windows (T95367) Mostly an uneventful update, except for FreeType giving its cmake options a rename. Reviewed By: brecht, sybren Differential Revision: https://developer.blender.org/D13968 --- build_files/build_environment/cmake/freetype.cmake | 11 ++++------- build_files/build_environment/cmake/versions.cmake | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'build_files') diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake index 52261b47618..c6663c287b1 100644 --- a/build_files/build_environment/cmake/freetype.cmake +++ b/build_files/build_environment/cmake/freetype.cmake @@ -19,13 +19,10 @@ set(FREETYPE_EXTRA_ARGS -DCMAKE_RELEASE_POSTFIX:STRING=2ST -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d - -DWITH_BZip2=OFF - -DWITH_HarfBuzz=OFF - -DFT_WITH_HARFBUZZ=OFF - -DFT_WITH_BZIP2=OFF - -DFT_WITH_BROTLI=ON - -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE - -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE + -DFT_DISABLE_BZIP2=ON + -DFT_DISABLE_HARFBUZZ=ON + -DFT_DISABLE_PNG=ON + -DFT_REQUIRE_BROTLI=ON -DPC_BROTLIDEC_INCLUDEDIR=${LIBDIR}/brotli/include -DPC_BROTLIDEC_LIBDIR=${LIBDIR}/brotli/lib ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index c5f9aecabbf..28a27023818 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -83,9 +83,9 @@ else() set(OPENEXR_VERSION_POSTFIX) endif() -set(FREETYPE_VERSION 2.11.0) +set(FREETYPE_VERSION 2.11.1) set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz) -set(FREETYPE_HASH cf09172322f6b50cf8f568bf8fe14bde) +set(FREETYPE_HASH bd4e3b007474319909a6b79d50908e85) set(FREETYPE_HASH_TYPE MD5) set(FREETYPE_FILE freetype-${FREETYPE_VERSION}.tar.gz) -- cgit v1.2.3