From 911042acc3be2fa51775eadef82173799ffa716d Mon Sep 17 00:00:00 2001
From: Vincent <vincent.pollet@idiap.ch>
Date: Wed, 20 Jan 2021 16:09:16 +0100
Subject: [PATCH] Increase build number of opencv to avoid conflicts in
bob-devel
---
conda/bob-devel/meta.yaml | 1 +
conda/opencv/meta.yaml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/conda/bob-devel/meta.yaml b/conda/bob-devel/meta.yaml
index d29765d9..5726678a 100644
--- a/conda/bob-devel/meta.yaml
+++ b/conda/bob-devel/meta.yaml
@@ -59,6 +59,7 @@ requirements:
- ncurses 6.2
- nose 1.3.7
- numpy 1.19.2
+ - opencv 4.5.0
- pandas 1.1.3
- pillow 8.0.1
- pkg-config 0.29.2
diff --git a/conda/opencv/meta.yaml b/conda/opencv/meta.yaml
index a623db3f..52cb5b59 100644
--- a/conda/opencv/meta.yaml
+++ b/conda/opencv/meta.yaml
@@ -41,7 +41,7 @@ source:
sha256: 78884f64b564a3b06dc6ee731ed33b60c6d8cd864cea07f21d94ba0f90c7b310 # [unix]
build:
- number: 0
+ number: 1
string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}
run_exports:
# https://abi-laboratory.pro/index.php?view=timeline&l=opencv
--
GitLab