Merge branch 'master' into vigra

.c3i/authorized_users.yml

@@ -1366,3 +1366,4 @@ authorized_users:
 - praetorian20
 - phbasler
 - gsantner
+- qihao727

recipes/blend2d/all/conandata.yml

@@ -1,28 +1,27 @@
 sources:
+  "0.11.1":
+    url: "https://blend2d.com/download/blend2d-0.11.1.tar.gz"
+    sha256: "f46d61b6aa477fea1a353a41f5906d4e861817ae059ed22fc6ecdd50ff859dd2"
+    # When upstream will have new release, tarball may be deleted.
+    # Use following url: https://github.com/blend2d/blend2d/archive/a7f947677e85441abe1769586d3bb935b4086a07.tar.gz
   "0.10.6":
-    url: "https://blend2d.com/download/blend2d-0.10.6.tar.xz"
-    sha256: "0377f747b76d5602874351501bbbd648ba73b486273a5dcabfd6dc85c4d289b4"
+    url: "https://github.com/blend2d/blend2d/archive/df124784fd3e9765251c74d412d88c625e3587e9.tar.gz"
+    sha256: "d8a91745c79beeab29d781357308b49ef51d009237b342ce50304ea618e977ad"
   "0.10.5":
-    url: "https://blend2d.com/download/blend2d-0.10.5.tar.xz"
-    sha256: "fff5a7b1a6b16c986f3d02052a9a030f138fbae3a9c16bf07915416515d6b9cd"
+    url: "https://github.com/blend2d/blend2d/archive/99fc3aa9a1d113e913df67166d40d2a81bef1dcb.tar.gz"
+    sha256: "cb7426a483156721c02b28cf65969bdeeb13ffed6cf9bc4a9493d7ec4d5de8c3"
   "0.10.4":
-    url: "https://blend2d.com/download/blend2d-0.10.4.tar.xz"
-    sha256: "6363e5c13c1c9e4709f949585a6af772ee13a16f75b0084f91b3918dece2fff3"
+    url: "https://github.com/blend2d/blend2d/archive/d60f62b9d008be096daff329dfe9b8409c344651.tar.gz"
+    sha256: "ce197422ae8ec0d0310895bebed396091e0144ec09482439d24040196957e740"
   "0.10":
-    url: "https://blend2d.com/download/blend2d-0.10.tar.xz"
-    sha256: "eaed6cc5f1fc33061a99d70cf166836994d952f75762bfacb397ee388e13ccc9"
+    url: "https://github.com/blend2d/blend2d/archive/000d55c75994fa88efcb7a31ae32be9ec8435f7d.tar.gz"
+    sha256: "7a986e14d08d687bfc7510bd762a29f01b1c2449b4e60f85268dd0072c65b698"
   "0.9":
-    url: "https://blend2d.com/download/blend2d-0.9.tar.xz"
-    sha256: "a70a2a57c67017afa1067a11807fef9808788c69b4012ba4d56a5c47a5ba87c3"
+    url: "https://github.com/blend2d/blend2d/archive/346555924752f085a2a06265858bc63c8987bf98.tar.gz"
+    sha256: "89639d60320e8d684c3708b849ede9ac660cbd2acc33de6baa846ee7fbed24b8"
   "0.8":
-    url: "https://blend2d.com/download/blend2d-0.8.zip"
-    sha256: "0c1e2cc94cd4aa054c527b2dc51d533c8783a8e31779de3ba7bb49f8bd9afca1"
-  "0.0.18":
-    url: "https://blend2d.com/download/blend2d-beta18.zip"
-    sha256: "02d23b185183705215241d7b161937bbda5b427c54cc5aa4c03238ef8dd1e60b"
-  "0.0.17":
-    url: "https://blend2d.com/download/blend2d-beta17.zip"
-    sha256: "06ee8fb0bea281d09291e498900093139426501a1a7f09dba0ec801dd340635e"
+    url: "https://github.com/blend2d/blend2d/archive/2910c87c5e8ddedcf80bbf4871bb59d70e1170c1.tar.gz"
+    sha256: "34ff6f0f2dd10b39e1e6a3b07c5f76844b38f780c6849a65a34351e76e36cd3d"
 patches:
   "0.10.6":
     - patch_file: "patches/0.10.6-0001-disable-embed-asmjit.patch"
@@ -48,15 +47,3 @@ patches:
     - patch_file: "patches/0.8-0001-disable-embed-asmjit.patch"
       patch_description: "use asmjit cci package"
       patch_type: "conan"
-  "0.0.18":
-    - patch_file: "patches/0.0.17-0001-disable-embed-asmjit.patch"
-      patch_description: "use asmjit cci package"
-      patch_type: "conan"
-    - patch_file: "patches/0.0.18-0002-fix-gcc12-compilationerror.patch"
-      patch_description: "fix gcc12 compilation error, backport from upstream"
-      patch_type: "portability"
-      patch_source: "https://github.com/blend2d/blend2d/commit/2574d90ebc61b5195491cc79bfa6da162084242b"
-  "0.0.17":
-    - patch_file: "patches/0.0.17-0001-disable-embed-asmjit.patch"
-      patch_description: "use asmjit cci package"
-      patch_type: "conan"

recipes/blend2d/all/conanfile.py

@@ -4,6 +4,7 @@
 from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
 from conan.tools.scm import Version
 from conan.tools.microsoft import check_min_vs
+from conan.tools.env import VirtualBuildEnv
 import os
 
 required_conan_version = ">=1.53.0"
@@ -45,7 +46,7 @@ def layout(self):
 
     def requirements(self):
         if self.options.with_jit:
-            self.requires("asmjit/cci.20230325")
+            self.requires("asmjit/cci.20240531")
 
     def validate(self):
         if self.settings.compiler.get_safe("cppstd"):
@@ -56,6 +57,10 @@ def validate(self):
             # https://github.com/blend2d/blend2d/commit/63db360c7eb2c1c3ca9cd92a867dbb23dc95ca7d
             check_min_vs(self, 192)
 
+    def build_requirements(self):
+        if Version(self.version) >= "0.11.1":
+            self.tool_requires("cmake/[>=3.18 <4]")
+
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
@@ -67,15 +72,17 @@ def generate(self):
         tc.variables["BLEND2D_STATIC"] = not self.options.shared
         tc.variables["BLEND2D_NO_STDCXX"] = False
         tc.variables["CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS"] = True
+        tc.variables["BLEND2D_EXTERNAL_ASMJIT"] = True
         if not valid_min_cppstd(self, 11):
             tc.variables["CMAKE_CXX_STANDARD"] = 11
         if not self.options.shared:
             tc.preprocessor_definitions["BL_STATIC"] = "1"
         tc.variables["BLEND2D_NO_JIT"] = not self.options.with_jit
         tc.generate()
-
         deps = CMakeDeps(self)
         deps.generate()
+        venv = VirtualBuildEnv(self)
+        venv.generate(scope="build")
 
     def build(self):
         apply_conandata_patches(self)

recipes/blend2d/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.11.1":
+    folder: all
   "0.10.6":
     folder: all
   "0.10.5":
@@ -11,7 +13,3 @@ versions:
     folder: all
   "0.8":
     folder: all
-  "0.0.18":
-    folder: all
-  "0.0.17":
-    folder: all

recipes/cmake/binary/conandata.yml

@@ -1,4 +1,23 @@
 sources:
+  "3.29.5":
+    Linux:
+      armv8:
+        url: "https://cmake.org/files/v3.29/cmake-3.29.5-linux-aarch64.tar.gz"
+        sha256: "6eb655ee89c50611f2370c5a3293bd2fe1920b73dff50b71fb3357d56a9d28d8"
+      x86_64:
+        url: "https://cmake.org/files/v3.29/cmake-3.29.5-linux-x86_64.tar.gz"
+        sha256: "92629f95e15e7c2e88726c57a984ffdc5cf248e354f7ab791bc86d2ad513903e"
+    Macos:
+      universal:
+        url: "https://cmake.org/files/v3.29/cmake-3.29.5-macos10.10-universal.tar.gz"
+        sha256: "a110d173ab839854fc0b19b9f29f213c1112106e2858c1a1fe7973d4bb13a536"
+    Windows:
+      armv8:
+        url: "https://cmake.org/files/v3.29/cmake-3.29.5-windows-arm64.zip"
+        sha256: "9c67d16560125ebf1278ef1b3072914a60bff780522b28c0096f364f775a8e55"
+      x86_64:
+        url: "https://cmake.org/files/v3.29/cmake-3.29.5-windows-x86_64.zip"
+        sha256: "f85db8361cb7eb11ceb6b2f1ee42bec7234bb8d9e487ea78c00de64771768d92"
   "3.29.4":
     Linux:
       armv8:

recipes/cmake/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.29.5":
+    folder: "binary"
   "3.29.4":
     folder: "binary"
   "3.29.3":

recipes/expected-lite/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.8.0":
+    url: "https://github.com/martinmoene/expected-lite/archive/v0.8.0.tar.gz"
+    sha256: "27649f30bd9d4fe7b193ab3eb6f78c64d0f585c24c085f340b4722b3d0b5e701"
   "0.7.0":
     url: "https://github.com/martinmoene/expected-lite/archive/v0.7.0.tar.gz"
     sha256: "8e266cd304d405e02a6b4abf881ab7d8e203ca719c513711cf89a3b4e5d97918"

recipes/expected-lite/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.8.0":
+    folder: all
   "0.7.0":
     folder: all
   "0.6.3":

recipes/shield/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.6":
+    url: "https://github.com/holoplot/shield/archive/0.6.tar.gz"
+    sha256: "9ed05e2be8268dc634367ce87aff8b4878b481353eacfdbd8d1f303888c9e3bb"
   "0.5":
     url: "https://github.com/holoplot/shield/archive/0.5.tar.gz"
     sha256: "f6494b1c95aeddb23fe507ab8da17234ecd7ca6aff97a92112e1e6459b343ff3"

recipes/shield/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.6":
+    folder: all
   "0.5":
     folder: all
   "0.4":

recipes/tree-sitter/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.22.6":
+    url: "https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.22.6.tar.gz"
+    sha256: "e2b687f74358ab6404730b7fb1a1ced7ddb3780202d37595ecd7b20a8f41861f"
   "0.22.5":
     url: "https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.22.5.tar.gz"
     sha256: "6bc22ca7e0f81d77773462d922cf40b44bfd090d92abac75cb37dbae516c2417"

recipes/tree-sitter/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.22.6":
+    folder: all
   "0.22.5":
     folder: all
   "0.22.1":