From e8a3d49f8bd1324528240a46ddee626acac98e8a Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:58:19 +0100 Subject: [PATCH 1/5] Bump version --- recipes/highfive/all/conandata.yml | 3 +++ recipes/highfive/config.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/recipes/highfive/all/conandata.yml b/recipes/highfive/all/conandata.yml index ffa1bf1cb2884..81278acab7dea 100644 --- a/recipes/highfive/all/conandata.yml +++ b/recipes/highfive/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "2.5.0": + url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.5.0.tar.gz" + sha256: "27f55596570df3cc8b878a1681a0d4ba0fe2e3da4a0ef8d436722990d77dc93a" "2.4.1": url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.4.1.tar.gz" sha256: "6826471ef5c645ebf947d29574b302991525a8a8ff1ef687aba7311d9a0ea36f" diff --git a/recipes/highfive/config.yml b/recipes/highfive/config.yml index 76fc6c1b1397d..9528c28594c00 100644 --- a/recipes/highfive/config.yml +++ b/recipes/highfive/config.yml @@ -1,4 +1,6 @@ versions: + "2.5.0": + folder: all "2.4.1": folder: all "2.3.1": From 19a2d6fb99b03004fdf53a514855e51278c894e6 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Sat, 12 Nov 2022 00:43:18 +0100 Subject: [PATCH 2/5] Add v2.5.1 and v2.6.1 --- recipes/highfive/all/conandata.yml | 9 ++++++--- recipes/highfive/config.yml | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/recipes/highfive/all/conandata.yml b/recipes/highfive/all/conandata.yml index 81278acab7dea..449154ab4490f 100644 --- a/recipes/highfive/all/conandata.yml +++ b/recipes/highfive/all/conandata.yml @@ -1,7 +1,10 @@ sources: - "2.5.0": - url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.5.0.tar.gz" - sha256: "27f55596570df3cc8b878a1681a0d4ba0fe2e3da4a0ef8d436722990d77dc93a" + "2.6.1": + url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.6.1.tar.gz" + sha256: "b5002c1221cf1821e02fb2ab891b0160bac88b43f56655bd844a472106ca3397" + "2.5.1": + url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.5.1.tar.gz" + sha256: "1ba05aa31cdeda03d013094eebc10f932783e4e071e253e9eaa8889120f241c7" "2.4.1": url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.4.1.tar.gz" sha256: "6826471ef5c645ebf947d29574b302991525a8a8ff1ef687aba7311d9a0ea36f" diff --git a/recipes/highfive/config.yml b/recipes/highfive/config.yml index 9528c28594c00..ba06b2b885fba 100644 --- a/recipes/highfive/config.yml +++ b/recipes/highfive/config.yml @@ -1,5 +1,7 @@ versions: - "2.5.0": + "2.6.1": + folder: all + "2.5.1": folder: all "2.4.1": folder: all From 57db1f6d973dc5ed13d7cdbfdefadf8d7a0ccbdf Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Fri, 18 Nov 2022 12:50:47 +0100 Subject: [PATCH 3/5] Change highfive.witn_opencv to be False by default --- recipes/highfive/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/highfive/all/conanfile.py b/recipes/highfive/all/conanfile.py index 2547f248b8e4c..11ed9374f0a0a 100644 --- a/recipes/highfive/all/conanfile.py +++ b/recipes/highfive/all/conanfile.py @@ -27,7 +27,7 @@ class HighFiveConan(ConanFile): "with_boost": True, "with_eigen": True, "with_xtensor": True, - "with_opencv": True, + "with_opencv": False, } def layout(self): From 87a55b87a30ef81d0e47ecf9debb8a161d9010b0 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Wed, 23 Nov 2022 11:31:09 +0100 Subject: [PATCH 4/5] Add v2.6.2 --- recipes/highfive/all/conandata.yml | 4 ++-- recipes/highfive/config.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/highfive/all/conandata.yml b/recipes/highfive/all/conandata.yml index 449154ab4490f..3beaa510e3921 100644 --- a/recipes/highfive/all/conandata.yml +++ b/recipes/highfive/all/conandata.yml @@ -1,6 +1,6 @@ sources: - "2.6.1": - url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.6.1.tar.gz" + "2.6.2": + url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.6.2.tar.gz" sha256: "b5002c1221cf1821e02fb2ab891b0160bac88b43f56655bd844a472106ca3397" "2.5.1": url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.5.1.tar.gz" diff --git a/recipes/highfive/config.yml b/recipes/highfive/config.yml index ba06b2b885fba..68e95d416e0fd 100644 --- a/recipes/highfive/config.yml +++ b/recipes/highfive/config.yml @@ -1,5 +1,5 @@ versions: - "2.6.1": + "2.6.2": folder: all "2.5.1": folder: all From 1fd9b4aec325b27d268c89e942ec443d2e398b24 Mon Sep 17 00:00:00 2001 From: Roberto Rossini <71787608+robomics@users.noreply.github.com> Date: Wed, 23 Nov 2022 12:48:28 +0100 Subject: [PATCH 5/5] Fix incorrect hash --- recipes/highfive/all/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/highfive/all/conandata.yml b/recipes/highfive/all/conandata.yml index 3beaa510e3921..22d7539389bd7 100644 --- a/recipes/highfive/all/conandata.yml +++ b/recipes/highfive/all/conandata.yml @@ -1,7 +1,7 @@ sources: "2.6.2": url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.6.2.tar.gz" - sha256: "b5002c1221cf1821e02fb2ab891b0160bac88b43f56655bd844a472106ca3397" + sha256: "ab51b9fbb49e877dd1aa7b53b4b26875f41e4e0b8ee0fc2f1d735e0d1e43d708" "2.5.1": url: "https://github.com/BlueBrain/HighFive/archive/refs/tags/v2.5.1.tar.gz" sha256: "1ba05aa31cdeda03d013094eebc10f932783e4e071e253e9eaa8889120f241c7"