From ff36c8abe060bc190f217c9ace1104c830945939 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 2 Jan 2025 20:02:45 +0900 Subject: [PATCH 1/2] blend2d: add version 0.11.5 --- recipes/blend2d/all/conandata.yml | 3 +++ recipes/blend2d/all/conanfile.py | 2 +- recipes/blend2d/config.yml | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/blend2d/all/conandata.yml b/recipes/blend2d/all/conandata.yml index 54dc0ba094e18..eca3fa386106a 100644 --- a/recipes/blend2d/all/conandata.yml +++ b/recipes/blend2d/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "0.11.5": + url: "https://blend2d.com/download/blend2d-0.11.5.tar.gz" + sha256: "733ad4f657b478450612bdf73490f3309713076eb30e0f4c55349d698a9d1ec9" "0.11.4": url: "https://blend2d.com/download/blend2d-0.11.4.tar.gz" sha256: "07f7d99d2ebb7b42a707a4f0035745b781faf9083933f944084f66e6246bb01c" diff --git a/recipes/blend2d/all/conanfile.py b/recipes/blend2d/all/conanfile.py index 5663998a64f81..e030da24e4c91 100644 --- a/recipes/blend2d/all/conanfile.py +++ b/recipes/blend2d/all/conanfile.py @@ -46,7 +46,7 @@ def layout(self): def requirements(self): if self.options.with_jit: - self.requires("asmjit/cci.20240531") + self.requires("asmjit/cci.20241216") def validate(self): if self.settings.compiler.get_safe("cppstd"): diff --git a/recipes/blend2d/config.yml b/recipes/blend2d/config.yml index b62e83e2e1cd2..34ab5619f3552 100644 --- a/recipes/blend2d/config.yml +++ b/recipes/blend2d/config.yml @@ -1,4 +1,6 @@ versions: + "0.11.5": + folder: all "0.11.4": folder: all "0.11.3": From a70c346c0d556c60bee931850dd80ff0e6b026c1 Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 3 Jan 2025 00:38:56 +0900 Subject: [PATCH 2/2] require asmjit/cci.20240531 for 0.11.4 --- recipes/blend2d/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/blend2d/all/conanfile.py b/recipes/blend2d/all/conanfile.py index e030da24e4c91..62dbeab8f19e9 100644 --- a/recipes/blend2d/all/conanfile.py +++ b/recipes/blend2d/all/conanfile.py @@ -46,7 +46,10 @@ def layout(self): def requirements(self): if self.options.with_jit: - self.requires("asmjit/cci.20241216") + if Version(self.version) >= "0.11.5": + self.requires("asmjit/cci.20241216") + else: + self.requires("asmjit/cci.20240531") def validate(self): if self.settings.compiler.get_safe("cppstd"):