3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 05:38:00 +08:00
Code Issues Projects Releases Wiki Activity

[freetype] Fix wrong brotli linkage (#20849)

Browse Source 
* [freetype] fix brotli module

* [skip actions] version stuff

* bump port version

* version stuff
This commit is contained in:
Alexander Neumann 2021-10-27 07:53:21 +02:00 committed by GitHub
parent 48dcbd29b3
commit d830a75c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/freetype/brotli-static.patch
View File

@ -2,21 +2,20 @@ 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
@@ -35,10 +35,17 @@ find_path(BROTLIDEC_INCLUDE_DIRS
PATH_SUFFIXES brotli)
find_library(BROTLIDEC_LIBRARIES
- NAMES brotlidec
+ NAMES brotlidec brotlidec-static
+ NAMES brotlidec brotlidec-static NAMES_PER_DIR
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)
+if(BROTLIDEC_LIBRARIES MATCHES "-static")
+ find_library(BROTLICOMMON_LIBRARIES
+ NAMES brotlicommon-static
+ HINTS ${PC_BROTLIDEC_LIBDIR}
+ ${PC_BROTLIDEC_LIBRARY_DIRS})
+ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES})
+endif()

2
ports/freetype/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "freetype",
"version-semver": "2.11.0",
"port-version": 1,
"port-version": 2,
"description": "A library to render fonts.",
"homepage": "https://www.freetype.org/",
"dependencies": [

2
versions/baseline.json
View File

@ -2250,7 +2250,7 @@
},
"freetype": {
"baseline": "2.11.0",
"port-version": 1
"port-version": 2
},
"freetype-gl": {
"baseline": "2020-09-14",

5
versions/f-/freetype.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9d21ff9f7071d83c1e04eca8cae21b99438400d8",
"version-semver": "2.11.0",
"port-version": 2
},
{
"git-tree": "a314ebd21048f1cf17a6b4330d9970c661f8fea7",
"version-semver": "2.11.0",