OpenCV 4.8.1 (#380)

automerged PR by conda-forge/automerge-action
conda-forge · Sep 28, 2023 · e9bbcf9 · e9bbcf9
2 parents bd2fdb8 + 10ed956
commit e9bbcf9
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 124 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/migrations/harfbuzz8.yaml b/.ci_support/migrations/harfbuzz8.yaml
diff --git a/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml b/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml
diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -19,7 +19,7 @@
 #
 # By putting all the generated files in 1 package, this makes the build process
 # much easier, at the expense of a few MBs in the 'lib' package.
-{% set version = "4.8.0" %}
+{% set version = "4.8.1" %}
 {% set major_version = version.split('.')[0] %}
 {% set PY_VER_MAJOR = PY_VER.split('.')[0] %}
 {% set PY_VER_MINOR = PY_VER.split('.')[1] %}
@@ -31,7 +31,7 @@ package:
 source:
   - url: https://github.com/opencv/opencv/archive/{{ version }}.tar.gz
     fn: opencv-{{ version }}.tar.gz
-    sha256: cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd
+    sha256: 62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5
     patches:
       # backport https://github.com/opencv/opencv/pull/21611 (unmerged as of 06/2023)
       - patches_opencv/0001-Add-installation-of-pip-metadata-from-cmake.patch
@@ -40,7 +40,7 @@ source:
       - patches_opencv/0004-fix-detection-for-protobuf-23.x.patch
   - url: https://github.com/opencv/opencv_contrib/archive/{{ version }}.tar.gz
     fn: opencv_contrib-{{ version }}.tar.gz
-    sha256: b4aef0f25a22edcd7305df830fa926ca304ea9db65de6ccd02f6cfa5f3357dbb
+    sha256: 0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e
     folder: opencv_contrib
     patches:
       # Allow attempt to find HDF5 on cross-compile
@@ -50,7 +50,7 @@ source:
     sha256: 78884f64b564a3b06dc6ee731ed33b60c6d8cd864cea07f21d94ba0f90c7b310
 
 build:
-  number: 4
+  number: 0
   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
@@ -106,7 +106,7 @@ requirements:
     - libwebp
     - qt-main                        # [not osx and not ppc64le]
     - zlib
-    - openvino                       # [not ppc64le]
+    - libopenvino-dev                # [not ppc64le]
 
 test:
     requires:
@@ -273,7 +273,6 @@ about:
 
 extra:
   recipe-maintainers:
-    - ilya-lavrenov
     - h-vetinari
     - xhochy
     - jakirkham
@@ -283,3 +282,4 @@ extra:
     - hajapy
     - ocefpaf
     - hmaarrfk
+    - ilya-lavrenov