From d830a75c99bd9dec1386750cc124e0e08dde0b79 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Wed, 27 Oct 2021 07:53:21 +0200
Subject: [PATCH] [freetype] Fix wrong brotli linkage (#20849)

* [freetype] fix brotli module

* [skip actions] version stuff

* bump port version

* version stuff
---
 ports/freetype/brotli-static.patch | 15 +++++++--------
 ports/freetype/vcpkg.json          |  2 +-
 versions/baseline.json             |  2 +-
 versions/f-/freetype.json          |  5 +++++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ports/freetype/brotli-static.patch b/ports/freetype/brotli-static.patch
index 8ef7fd5e3b..6d657aa5a3 100644
--- a/ports/freetype/brotli-static.patch
+++ b/ports/freetype/brotli-static.patch
@@ -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()
  
diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json
index d9e49300a2..23f9e81339 100644
--- a/ports/freetype/vcpkg.json
+++ b/ports/freetype/vcpkg.json
@@ -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": [
diff --git a/versions/baseline.json b/versions/baseline.json
index c86a213cea..00a234e36b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2250,7 +2250,7 @@
     },
     "freetype": {
       "baseline": "2.11.0",
-      "port-version": 1
+      "port-version": 2
     },
     "freetype-gl": {
       "baseline": "2020-09-14",
diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json
index 950afdff05..55c9b9b2f7 100644
--- a/versions/f-/freetype.json
+++ b/versions/f-/freetype.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9d21ff9f7071d83c1e04eca8cae21b99438400d8",
+      "version-semver": "2.11.0",
+      "port-version": 2
+    },
     {
       "git-tree": "a314ebd21048f1cf17a6b4330d9970c661f8fea7",
       "version-semver": "2.11.0",