From 9cdc3a8dfe7ba5418f4b182b267797f5d1d7321d Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Mon, 17 Nov 2025 20:24:35 +0100
Subject: [PATCH] [ftgl] Fix cmake config fixup (#48321)

---
 ports/ftgl/install-pkgconfig.diff | 10 +++++-----
 ports/ftgl/portfile.cmake         |  2 +-
 ports/ftgl/vcpkg.json             |  2 +-
 scripts/ci.feature.baseline.txt   |  1 +
 versions/baseline.json            |  2 +-
 versions/f-/ftgl.json             |  5 +++++
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ports/ftgl/install-pkgconfig.diff b/ports/ftgl/install-pkgconfig.diff
index 70440992bf..4b09de474f 100644
--- a/ports/ftgl/install-pkgconfig.diff
+++ b/ports/ftgl/install-pkgconfig.diff
@@ -21,10 +21,10 @@ index 0000000..d242667
 --- /dev/null
 +++ b/ftgl.pc.cmake
 @@ -0,0 +1,6 @@
-+Name: ftgl
-+Description: OpenGL frontend to Freetype 2
-+Requires.private: freetype2
-+Version: @VERSION_SERIES@.@VERSION_MAJOR@.@VERSION_MINOR@
-+Libs: -L@CMAKE_INSTALL_PREFIX@/lib -lftgl
++Name: ftgl
++Description: OpenGL frontend to Freetype 2
++Requires.private: freetype2
++Version: @VERSION_SERIES@.@VERSION_MAJOR@.@VERSION_MINOR@
++Libs: -L@CMAKE_INSTALL_PREFIX@/lib -lftgl
 +Cflags: -I@CMAKE_INSTALL_PREFIX@/include
 \ No newline at end of file
diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake
index cd6a2c17b4..6787e94eb6 100644
--- a/ports/ftgl/portfile.cmake
+++ b/ports/ftgl/portfile.cmake
@@ -23,7 +23,7 @@ vcpkg_cmake_install()
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else ()
-    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FTGL)
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
diff --git a/ports/ftgl/vcpkg.json b/ports/ftgl/vcpkg.json
index 371d00ead7..65671378c2 100644
--- a/ports/ftgl/vcpkg.json
+++ b/ports/ftgl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ftgl",
   "version": "2.4.0",
-  "port-version": 6,
+  "port-version": 7,
   "description": [
     "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.",
     "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.",
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index c891749ac3..d5047c6de0 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -95,6 +95,7 @@ forge:x86-windows=fail
 freeglut(android)=fail
 freeglut(osx)=fail # Needs XQuartz
 freeopcua:arm64-windows=fail # Needs /bigobj
+ftgl(android)=fail
 functions-framework-cpp:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207
 g3log:arm-neon-android=fail
 g3log:arm64-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index b87b526575..099fe4adee 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3130,7 +3130,7 @@
     },
     "ftgl": {
       "baseline": "2.4.0",
-      "port-version": 6
+      "port-version": 7
     },
     "ftxui": {
       "baseline": "6.1.9",
diff --git a/versions/f-/ftgl.json b/versions/f-/ftgl.json
index e77d2e3769..b138037795 100644
--- a/versions/f-/ftgl.json
+++ b/versions/f-/ftgl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f843533b76f9fcf6de408ba47855ceb3b0ce3415",
+      "version": "2.4.0",
+      "port-version": 7
+    },
     {
       "git-tree": "890825a544038137cc715f1c7ec7f5afe828803a",
       "version": "2.4.0",