[blend2d] update port to 2024-06-28 (#39730)

Co-authored-by: Kai Pastor <dg0yt@darc.de>

ports/blend2d/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO blend2d/blend2d
-  REF 7f292c15bafd8a7d92791f421cecb2ce84a75da8 # commited on 2023-06-16
-  SHA512 dfd97a27b88bd94753b1404cbe63989186185bb6700b5c65a22b48e14fec7392038e328f30ea71a893c7bbee376f6017b4cdc2bf596259146be601d934c4fbdf
+  REF 9a86b2700917ced827c008c3dd488108afb3490c # commited on 2024-07-08
+  SHA512 741404d4c7044e8d338ad5b02e6b6e00b7e40f9c9cf03c53de4607447b552f559747d4a96d53c7b6311abb6348f4bf8a4abd6d726c51be8c1b7e65e540c4f128
   HEAD_REF master
 )
 
@@ -11,31 +11,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC)
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
   INVERTED_FEATURES
     jit        BLEND2D_NO_JIT
-    logging    BLEND2D_NO_JIT_LOGGING
-    tls        BLEND2D_NO_TLS
 )
 
-if(NOT BLEND2D_NO_JIT)
-  vcpkg_from_github(
-    OUT_SOURCE_PATH ASMJIT_SOURCE_PATH
-    REPO asmjit/asmjit
-    REF 3577608cab0bc509f856ebf6e41b2f9d9f71acc4 # commited on 2023-04-28
-    SHA512 36557af5c82ccc8e5ef2d4effe22b75e22c2bf1f4504daae3ff813e907449be6e7b25678af071cb9dede7c6e02dc5c8ad2fc2a3da011aa660eb7f5c75ab23042
-    HEAD_REF master
-  )
-
-  file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/asmjit")
-
-  get_filename_component(ASMJIT_SOURCE_DIR_NAME "${ASMJIT_SOURCE_PATH}" NAME)
-  file(COPY "${ASMJIT_SOURCE_PATH}" DESTINATION "${SOURCE_PATH}/3rdparty")
-  file(RENAME "${SOURCE_PATH}/3rdparty/${ASMJIT_SOURCE_DIR_NAME}" "${SOURCE_PATH}/3rdparty/asmjit")
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DBLEND2D_STATIC=${BLEND2D_STATIC}"
         "-DBLEND2D_NO_FUTEX=OFF"
+        "-DBLEND2D_EXTERNAL_ASMJIT=ON"
         ${FEATURE_OPTIONS}
 )
 
@@ -45,14 +28,17 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-if(BLEND2D_STATIC)
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blend2d/api.h"
+        "#if !defined(BL_STATIC)"
+        "#if 0"
+    )
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/blend2d-debug.h"
+        "#if defined(BL_STATIC)"
+        "#if 1"
+    )
 endif()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
-
-if(BLEND2D_STATIC)
-  file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage_static.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage)
-else()
-  file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-endif()

ports/blend2d/usage_static.txt

@@ -1,6 +0,0 @@
-blend2d provides CMake targets:
-
-    find_package(blend2d CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE blend2d::blend2d)
-
-Also, define BL_STATIC before any blend2d includes.

ports/blend2d/vcpkg.json

@@ -1,12 +1,11 @@
 {
   "name": "blend2d",
-  "version-date": "2023-06-16",
-  "port-version": 1,
-  "description": "Beta 2D Vector Graphics Powered by a JIT Compiler",
+  "version-date": "2024-07-08",
+  "description": "2D Vector Graphics Engine Powered by a JIT Compiler",
   "homepage": "https://github.com/blend2d/blend2d",
   "documentation": "https://blend2d.com/doc/index.html",
   "license": "Zlib",
-  "supports": "!uwp & !wasm32",
+  "supports": "!wasm32",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
@@ -18,41 +17,17 @@
     }
   ],
   "default-features": [
-    "jit",
-    "logging",
-    "tls"
+    {
+      "name": "jit",
+      "platform": "!arm32"
+    }
   ],
   "features": {
     "jit": {
-      "description": "Default feature. Enables jit pipeline compilation.",
+      "description": "Enables JIT compiler to generate optimized pipelines.",
+      "supports": "!arm32",
       "dependencies": [
-        {
-          "name": "blend2d",
-          "default-features": false,
-          "platform": "windows"
-        }
-      ]
-    },
-    "logging": {
-      "description": "Default feature. Enables logging.",
-      "dependencies": [
-        {
-          "name": "blend2d",
-          "default-features": false,
-          "features": [
-            "jit"
-          ]
-        }
-      ]
-    },
-    "tls": {
-      "description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported.",
-      "dependencies": [
-        {
-          "name": "blend2d",
-          "default-features": false,
-          "platform": "windows"
-        }
+        "asmjit"
       ]
     }
   }

ports/osgearth/blend2d.patch

@@ -0,0 +1,22 @@
+diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp
+index 2b823a58f..ecf1cd13f 100644
+--- a/src/osgEarth/FeatureRasterizer.cpp
++++ b/src/osgEarth/FeatureRasterizer.cpp
+@@ -487,7 +487,7 @@ namespace osgEarth {
+                     ctx.scale(scale);
+                     ctx.blitImage(BLPoint((double)g->left - GLYPH_PADDING, (double)(-g->top) - GLYPH_PADDING), sprite, glyphRect);
+                     //ctx.blitImage(BLPoint(0, 0), sprite, glyphRect);
+-                    ctx.resetMatrix();
++                    ctx.resetTransform();
+ 
+ #if 0
+                     // Draw the text bounding box
+@@ -572,7 +572,7 @@ namespace osgEarth {
+                                             ctx.translate(x, y);
+                                             ctx.scale(scale);
+                                             ctx.blitImage(BLPoint(-iconRect.w / 2.0, -iconRect.h / 2.0), sprite, iconRect);
+-                                            ctx.resetMatrix();
++                                            ctx.resetTransform();
+                                         }
+                                     });
+                             }

ports/osgearth/portfile.cmake

@@ -8,9 +8,10 @@ vcpkg_from_github(
         link-libraries.patch
         find-package.patch
         remove-tool-debug-suffix.patch
-		remove-lerc-gltf.patch
-		export-plugins.patch
+        remove-lerc-gltf.patch
+        export-plugins.patch
         protobuf.patch
+        blend2d.patch
 )
 
 if("tools" IN_LIST FEATURES)

ports/osgearth/vcpkg.json

@@ -1,11 +1,11 @@
 {
   "name": "osgearth",
   "version": "3.4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.",
   "homepage": "https://github.com/gwaldron/osgearth",
   "license": "LGPL-3.0-or-later",
-  "supports": "!(arm | x86 | wasm32 | xbox)",
+  "supports": "!(arm | x86 | wasm32 | xbox | uwp)",
   "dependencies": [
     "basisu",
     "blosc",

versions/b-/blend2d.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2552a43118b9e6890e486db9376c0c69b6cc82ca",
+      "version-date": "2024-07-08",
+      "port-version": 0
+    },
     {
       "git-tree": "a5440e80d03f5d70356c3295281949898811ff97",
       "version-date": "2023-06-16",

versions/baseline.json

@@ -681,8 +681,8 @@
       "port-version": 1
     },
     "blend2d": {
-      "baseline": "2023-06-16",
-      "port-version": 1
+      "baseline": "2024-07-08",
+      "port-version": 0
     },
     "blingfire": {
       "baseline": "0.1.8.1",
@@ -6670,7 +6670,7 @@
     },
     "osgearth": {
       "baseline": "3.4",
-      "port-version": 2
+      "port-version": 3
     },
     "osmanip": {
       "baseline": "4.6.1",

versions/o-/osgearth.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3429fc472870b99752ea2dc1fe8b7df7f4ebedaf",
+      "version": "3.4",
+      "port-version": 3
+    },
     {
       "git-tree": "3412700e8699006bff1c2d4947500da9b180a0c5",
       "version": "3.4",