[freetype] update to 2.11.0 #19284
There are no files selected for viewing
This file contains hidden or 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 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -2145,7 +2145,7 @@ | |
| "port-version": 1 | ||
| }, | ||
| "freetype": { | ||
| "baseline": "2.11.0", | ||
| "port-version": 0 | ||
| }, | ||
| "freetype-gl": { | ||
|
|
||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The patch is still used?