-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[freetype] update to 2.11.0 (#19284)
* [freetype] update to 2.11.0 * add version files
- Loading branch information
1 parent
c0bc5e1
commit dd6fd59
Showing
10 changed files
with
103 additions
and
118 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,24 @@ | ||
diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake | ||
index 7c484c7df..0bd49b825 100644 | ||
--- a/builds/cmake/FindBrotliDec.cmake | ||
+++ b/builds/cmake/FindBrotliDec.cmake | ||
@@ -34,14 +34,22 @@ find_path(BROTLIDEC_INCLUDE_DIRS | ||
PATH_SUFFIXES brotli) | ||
|
||
find_library(BROTLIDEC_LIBRARIES | ||
- NAMES brotlidec | ||
+ NAMES brotlidec brotlidec-static | ||
HINTS ${PC_BROTLIDEC_LIBDIR} | ||
${PC_BROTLIDEC_LIBRARY_DIRS}) | ||
|
||
+find_library(BROTLICOMMON_LIBRARIES | ||
+ NAMES brotlicommon-static | ||
+ HINTS ${PC_BROTLIDEC_LIBDIR} | ||
+ ${PC_BROTLIDEC_LIBRARY_DIRS}) | ||
+ | ||
+if(BROTLICOMMON_LIBRARIES) | ||
+ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) | ||
+endif() | ||
|
||
include(FindPackageHandleStandardArgs) | ||
find_package_handle_standard_args( | ||
- brotlidec | ||
+ BrotliDec | ||
REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES | ||
FOUND_VAR BROTLIDEC_FOUND | ||
VERSION_VAR BROTLIDEC_VERSION) | ||
diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake | ||
index 46356b1fd..ed4cc2409 100644 | ||
--- a/builds/cmake/FindBrotliDec.cmake | ||
+++ b/builds/cmake/FindBrotliDec.cmake | ||
@@ -35,10 +35,18 @@ find_path(BROTLIDEC_INCLUDE_DIRS | ||
PATH_SUFFIXES brotli) | ||
|
||
find_library(BROTLIDEC_LIBRARIES | ||
- NAMES brotlidec | ||
+ NAMES brotlidec brotlidec-static | ||
HINTS ${PC_BROTLIDEC_LIBDIR} | ||
${PC_BROTLIDEC_LIBRARY_DIRS}) | ||
|
||
+find_library(BROTLICOMMON_LIBRARIES | ||
+ NAMES brotlicommon-static | ||
+ HINTS ${PC_BROTLIDEC_LIBDIR} | ||
+ ${PC_BROTLIDEC_LIBRARY_DIRS}) | ||
+ | ||
+if(BROTLICOMMON_LIBRARIES) | ||
+ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) | ||
+endif() | ||
|
||
include(FindPackageHandleStandardArgs) | ||
find_package_handle_standard_args( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index cb1b9a0f2..53d0bfc68 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -503,7 +503,7 @@ endif () | ||
if (BZIP2_FOUND) | ||
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) | ||
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS | ||
- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2") | ||
+ list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2") | ||
endif () | ||
if (PNG_FOUND) | ||
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{ | ||
"name": "freetype", | ||
"version-semver": "2.11.0", | ||
"description": "A library to render fonts.", | ||
"homepage": "https://www.freetype.org/", | ||
"dependencies": [ | ||
{ | ||
"name": "vcpkg-cmake", | ||
"host": true | ||
}, | ||
{ | ||
"name": "vcpkg-cmake-config", | ||
"host": true | ||
} | ||
], | ||
"default-features": [ | ||
"brotli", | ||
"bzip2", | ||
"png", | ||
"zlib" | ||
], | ||
"features": { | ||
"brotli": { | ||
"description": "Support decompression of WOFF2 streams", | ||
"dependencies": [ | ||
"brotli" | ||
] | ||
}, | ||
"bzip2": { | ||
"description": "Support bzip2 compressed fonts.", | ||
"dependencies": [ | ||
"bzip2" | ||
] | ||
}, | ||
"png": { | ||
"description": "Support PNG compressed OpenType embedded bitmaps.", | ||
"dependencies": [ | ||
"libpng" | ||
] | ||
}, | ||
"zlib": { | ||
"description": "Use zlib instead of internal library for DEFLATE", | ||
"dependencies": [ | ||
"zlib" | ||
] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters