mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 20:58:01 +08:00
[freetype] Update to 2.13.2 (#36303)
* [freetype] Update to 2.13.2 * Fixes for simultaneous use of find_package(Freetype) in CONFIG and MODULE modes * [freetype] Cleanup vcpkg-cmake-wrapper.cmake --------- Co-authored-by: Cazadorro <shaebolt@gmail.com>
This commit is contained in:
parent
d5e173c8f5
commit
6b6fc76c89
@ -1,37 +0,0 @@
|
|||||||
From 5672a353682a68cb76a03179739bdec0a2f5cf0e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sean Farrell <sean.farrell@rioki.org>
|
|
||||||
Date: Fri, 19 Aug 2022 15:32:19 +0200
|
|
||||||
Subject: [PATCH] Adds config support for error strings.
|
|
||||||
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index feb4be39a..4eea860e8 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -215,6 +215,8 @@ cmake_dependent_option(FT_REQUIRE_BROTLI
|
|
||||||
"Require support of compressed WOFF2 fonts." OFF
|
|
||||||
"NOT FT_DISABLE_BROTLI" OFF)
|
|
||||||
|
|
||||||
+option(FT_ENABLE_ERROR_STRINGS
|
|
||||||
+ "Enable support for meaningful error descriptions" OFF)
|
|
||||||
|
|
||||||
# Disallow in-source builds
|
|
||||||
if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
|
|
||||||
@@ -353,6 +355,11 @@ if (BROTLIDEC_FOUND)
|
|
||||||
"/\\* +(#define +FT_CONFIG_OPTION_USE_BROTLI) +\\*/" "\\1"
|
|
||||||
FTOPTION_H "${FTOPTION_H}")
|
|
||||||
endif ()
|
|
||||||
+if (FT_ENABLE_ERROR_STRINGS)
|
|
||||||
+ string(REGEX REPLACE
|
|
||||||
+ "/\\* +(#define +FT_CONFIG_OPTION_ERROR_STRINGS) +\\*/" "\\1"
|
|
||||||
+ FTOPTION_H "${FTOPTION_H}")
|
|
||||||
+endif ()
|
|
||||||
|
|
||||||
set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h")
|
|
||||||
if (EXISTS "${FTOPTION_H_NAME}")
|
|
||||||
--
|
|
||||||
2.33.0.windows.2
|
|
||||||
|
|
@ -22,7 +22,7 @@ index cb1b9a0f2..edca5d579 100644
|
|||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype
|
||||||
COMPONENT headers)
|
COMPONENT headers)
|
||||||
+
|
+
|
||||||
+ if(ZLIB_FOUND)
|
+ if(ZLIB_FOUND AND BUILD_SHARED_LIBS)
|
||||||
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake"
|
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake"
|
||||||
+[[include(CMakeFindDependencyMacro)
|
+[[include(CMakeFindDependencyMacro)
|
||||||
+find_dependency(ZLIB)
|
+find_dependency(ZLIB)
|
||||||
|
@ -1,17 +1,14 @@
|
|||||||
set(FT_VERSION 2.12.1)
|
|
||||||
|
|
||||||
vcpkg_from_sourceforge(
|
vcpkg_from_sourceforge(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO freetype/freetype2
|
REPO freetype/freetype2
|
||||||
REF ${FT_VERSION}
|
REF "${VERSION}"
|
||||||
FILENAME freetype-${FT_VERSION}.tar.xz
|
FILENAME freetype-${VERSION}.tar.xz
|
||||||
SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
|
SHA512 a5917edaa45cb9f75786f8a4f9d12fdf07529247e09dfdb6c0cf7feb08f7588bb24f7b5b11425fb47f8fd62fcb426e731c944658f6d5a59ce4458ad5b0a50194
|
||||||
PATCHES
|
PATCHES
|
||||||
0003-Fix-UWP.patch
|
0003-Fix-UWP.patch
|
||||||
brotli-static.patch
|
brotli-static.patch
|
||||||
bzip2.patch
|
bzip2.patch
|
||||||
fix-exports.patch
|
fix-exports.patch
|
||||||
error-strings.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
|
@ -2,7 +2,38 @@ cmake_policy(PUSH)
|
|||||||
cmake_policy(SET CMP0012 NEW)
|
cmake_policy(SET CMP0012 NEW)
|
||||||
cmake_policy(SET CMP0054 NEW)
|
cmake_policy(SET CMP0054 NEW)
|
||||||
|
|
||||||
_find_package(${ARGS})
|
list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE")
|
||||||
|
_find_package(${ARGS} CONFIG)
|
||||||
|
|
||||||
|
if(Freetype_FOUND)
|
||||||
|
include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake")
|
||||||
|
|
||||||
|
get_target_property(_freetype_include_dirs freetype INTERFACE_INCLUDE_DIRECTORIES)
|
||||||
|
|
||||||
|
if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||||
|
get_target_property(_freetype_location_debug freetype IMPORTED_IMPLIB_DEBUG)
|
||||||
|
get_target_property(_freetype_location_release freetype IMPORTED_IMPLIB_RELEASE)
|
||||||
|
endif()
|
||||||
|
if(NOT _freetype_location_debug AND NOT _freetype_location_release)
|
||||||
|
get_target_property(_freetype_location_debug freetype IMPORTED_LOCATION_DEBUG)
|
||||||
|
get_target_property(_freetype_location_release freetype IMPORTED_LOCATION_RELEASE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(FREETYPE_FOUND TRUE)
|
||||||
|
|
||||||
|
set(FREETYPE_INCLUDE_DIRS "${_freetype_include_dirs}")
|
||||||
|
set(FREETYPE_INCLUDE_DIR_ft2build "${_freetype_include_dirs}")
|
||||||
|
set(FREETYPE_INCLUDE_DIR_freetype2 "${_freetype_include_dirs}")
|
||||||
|
set(FREETYPE_LIBRARY_DEBUG "${_freetype_location_debug}" CACHE INTERNAL "vcpkg")
|
||||||
|
set(FREETYPE_LIBRARY_RELEASE "${_freetype_location_release}" CACHE INTERNAL "vcpkg")
|
||||||
|
select_library_configurations(FREETYPE)
|
||||||
|
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
|
||||||
|
set(FREETYPE_VERSION_STRING "${Freetype_VERSION}")
|
||||||
|
|
||||||
|
unset(_freetype_include_dirs)
|
||||||
|
unset(_freetype_location_debug)
|
||||||
|
unset(_freetype_location_release)
|
||||||
|
endif()
|
||||||
|
|
||||||
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
||||||
if("@FT_REQUIRE_ZLIB@")
|
if("@FT_REQUIRE_ZLIB@")
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "freetype",
|
"name": "freetype",
|
||||||
"version": "2.12.1",
|
"version": "2.13.2",
|
||||||
"port-version": 5,
|
|
||||||
"description": "A library to render fonts.",
|
"description": "A library to render fonts.",
|
||||||
"homepage": "https://www.freetype.org/",
|
"homepage": "https://www.freetype.org/",
|
||||||
"license": "FTL OR GPL-2.0-or-later",
|
"license": "FTL OR GPL-2.0-or-later",
|
||||||
|
@ -2801,8 +2801,8 @@
|
|||||||
"port-version": 2
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"freetype": {
|
"freetype": {
|
||||||
"baseline": "2.12.1",
|
"baseline": "2.13.2",
|
||||||
"port-version": 5
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"freetype-gl": {
|
"freetype-gl": {
|
||||||
"baseline": "2022-01-17",
|
"baseline": "2022-01-17",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "443f320ccf3139bc1818f0cc273944a56e960d6e",
|
||||||
|
"version": "2.13.2",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "e5480587e6a2faf047bc6d8520e48c12fc57604a",
|
"git-tree": "e5480587e6a2faf047bc6d8520e48c12fc57604a",
|
||||||
"version": "2.12.1",
|
"version": "2.12.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user