[msdfgen] Update to 1.9.1 (#20639)

* Update msdfgen to 1.9.1

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>

5 files changed, 39 insertions, 40 deletions

diff --git a/ports/msdfgen/compatibility.patch b/ports/msdfgen/compatibility.patch
deleted file mode 100644
index f1662549a..000000000
--- a/ports/msdfgen/compatibility.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/ext/import-font.cpp b/ext/import-font.cpp

-index 8f23620..ed26f54 100644

---- a/ext/import-font.cpp

-+++ b/ext/import-font.cpp

-@@ -7,10 +7,6 @@

- #include FT_FREETYPE_H

- #include FT_OUTLINE_H

- 

--#ifdef _WIN32

--    #pragma comment(lib, "freetype.lib")

--#endif

--

- namespace msdfgen {

- 

- #define REQUIRE(cond) { if (!(cond)) return false; }

diff --git a/ports/msdfgen/portfile.cmake b/ports/msdfgen/portfile.cmake
index cfe688c44..16bb48a7e 100644
--- a/ports/msdfgen/portfile.cmake
+++ b/ports/msdfgen/portfile.cmake
@@ -1,44 +1,42 @@
 # No symbols are exported in msdfgen source

 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 

+if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP)

+    message(FATAL_ERROR "Tools cannot be built on UWP.")

+endif()

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Chlumsky/msdfgen

-    REF 9af250c7d6780a41dcaf536c05e3e1987a1bdcd7

-    SHA512 6b1dadd386aedf1e2de927dc83fe1f7fd7e053b0e9829ea0609a193ab8d9f92ecf08d2a6225b76a4f7bf9344b2935f38bbd00c4cc0c6627c1d95f67d2db728fe

+    REF v1.9.1
+    SHA512 7A721B38027548F66D1C3EB862C1F27EA0A431C325119504D072BA6D7ED87539BA4D6020C663354B7B82BA48725D77CC642DB05FB596749292A2A12BE21CE528
     HEAD_REF master

-    PATCHES

-        compatibility.patch

 )

 

-set(BUILD_TOOLS OFF)

-if ("tools" IN_LIST FEATURES)

-    if (VCPKG_TARGET_IS_UWP)

-        message("Tools couldn't be built on UWP, disable it automatically.")

-    else()

-        set(BUILD_TOOLS ON)

-    endif()

-endif()

+vcpkg_check_features(

+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    FEATURES

+        tools MSDFGEN_BUILD_MSDFGEN_STANDALONE

+        openmp MSDFGEN_USE_OPENMP

+)

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

-        -DMSDFGEN_BUILD_MSDFGEN_STANDALONE=${BUILD_TOOLS}

+        ${FEATURE_OPTIONS}

 )

 

-vcpkg_install_cmake()

+vcpkg_cmake_install()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/msdfgen)

+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/msdfgen)

 

 # move exe to tools

-if(BUILD_TOOLS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")

+if("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     vcpkg_copy_tools(TOOL_NAMES msdfgen AUTO_CLEAN)

 endif()

 

-

 # cleanup

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

 # license

-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/msdfgen/vcpkg.json b/ports/msdfgen/vcpkg.json
index 5c8d9628c..ebc4372ee 100644
--- a/ports/msdfgen/vcpkg.json
+++ b/ports/msdfgen/vcpkg.json
@@ -1,12 +1,23 @@
 {
   "name": "msdfgen",
-  "version-string": "1.8",
+  "version": "1.9.1",
   "description": "Multi-channel signed distance field generator",
   "homepage": "https://github.com/Chlumsky/msdfgen",
   "dependencies": [
-    "freetype"
+    "freetype",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
+    "openmp": {
+      "description": "Build with OpenMP support for multi-threaded code."
+    },
     "tools": {
       "description": "Generates an executable inside the tools folder. Not supported on UWP."
     }
diff --git a/versions/baseline.json b/versions/baseline.json
index d1898e68f..f50c2f5fd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4433,7 +4433,7 @@
       "port-version": 0
     },
     "msdfgen": {
-      "baseline": "1.8",
+      "baseline": "1.9.1",
       "port-version": 0
     },
     "msgpack": {
diff --git a/versions/m-/msdfgen.json b/versions/m-/msdfgen.json
index 1ae233d43..333d04e5c 100644
--- a/versions/m-/msdfgen.json
+++ b/versions/m-/msdfgen.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "eade2edd986173003ec960fa30d29226a35ddb68",
+      "version": "1.9.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "8b15da4b26ea13caeba60337d49e6d5ec17c3e11",
       "version-string": "1.8",
       "port-version": 0