From aa92328e0edd3fef066217605088c0bb10305005 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Tue, 25 Nov 2025 23:44:31 +0100 Subject: [PATCH 1/2] Update freetype update freetype to version 2.14.1 changelog: https://freetype.org/index.html#news --- CMake/Dependencies.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index b57dd600a34..7c3bde21a23 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -102,10 +102,10 @@ if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH}) if (NOT FREETYPE_FOUND) message(STATUS "Building freetype") file(DOWNLOAD - https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.gz - ${PROJECT_BINARY_DIR}/freetype-2.13.2.tar.gz) + https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.gz + ${PROJECT_BINARY_DIR}/freetype-2.14.1.tar.gz) execute_process(COMMAND ${CMAKE_COMMAND} - -E tar xf freetype-2.13.2.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) + -E tar xf freetype-2.14.1.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) # patch toolchain for iOS execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/CMake/toolchain/ios.toolchain.xcode.cmake @@ -117,13 +117,13 @@ if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH}) -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BrotliDec=TRUE - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + -DCMAKE_POLICY_VERSION_MINIMUM=3.12 # workaround for broken iOS toolchain in freetype - -DPROJECT_SOURCE_DIR=${PROJECT_BINARY_DIR}/freetype-2.13.2 - ${PROJECT_BINARY_DIR}/freetype-2.13.2 - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/freetype-2.13.2/objs) + -DPROJECT_SOURCE_DIR=${PROJECT_BINARY_DIR}/freetype-2.14.1 + ${PROJECT_BINARY_DIR}/freetype-2.14.1 + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/freetype-2.14.1/objs) execute_process(COMMAND ${CMAKE_COMMAND} - --build ${PROJECT_BINARY_DIR}/freetype-2.13.2/objs ${BUILD_COMMAND_OPTS}) + --build ${PROJECT_BINARY_DIR}/freetype-2.14.1/objs ${BUILD_COMMAND_OPTS}) endif() if(MSVC OR MINGW OR SKBUILD) # other platforms dont need this From ea03ac8bec973a55c4e7c4de59a11aeb372b7123 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:34:22 +0100 Subject: [PATCH 2/2] Update Dependencies.cmake --- CMake/Dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index 7c3bde21a23..2f9b18e2215 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -109,7 +109,7 @@ if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH}) # patch toolchain for iOS execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/CMake/toolchain/ios.toolchain.xcode.cmake - freetype-2.13.2/builds/cmake/iOS.cmake + freetype-2.14.1/builds/cmake/iOS.cmake WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) execute_process(COMMAND ${BUILD_COMMAND_COMMON} -DBUILD_SHARED_LIBS=${OGREDEPS_SHARED}