OpenCV 4.8.0 (#371)

automerged PR by conda-forge/automerge-action
conda-forge · Jul 22, 2023 · 891639f · 891639f
2 parents c4f67d6 + d022f37
commit 891639f
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 18 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/migrations/harfbuzz7.yaml b/.ci_support/migrations/harfbuzz7.yaml
diff --git a/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.10.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.8.____73_pypy.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.8.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.9.____73_pypy.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21numpy1.21python3.9.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf3.21numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_libprotobuf3.21numpy1.23python3.11.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.10.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.8.____73_pypy.yaml b/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.8.____73_pypy.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.8.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.8.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.9.____73_pypy.yaml b/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.9.____73_pypy.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.9.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.3numpy1.21python3.9.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.ci_support/osx_64_libprotobuf4.23.3numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_libprotobuf4.23.3numpy1.23python3.11.____cpython.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+MACOSX_SDK_VERSION:
+- '10.12'
 c_compiler:
 - clang
 c_compiler_version:

diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -73,6 +73,7 @@ cmake -LAH -G "Ninja"
     -DWITH_OPENCLAMDFFT=0                                                           ^
     -DWITH_OPENCLAMDBLAS=0                                                          ^
     -DWITH_OPENCL_D3D11_NV=0                                                        ^
+    -DWITH_OPENVINO=1                                                               ^
     -DWITH_1394=0                                                                   ^
     -DWITH_OPENNI=0                                                                 ^
     -DWITH_HDF5=1                                                                   ^

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -7,6 +7,7 @@ ln -s $PREFIX/include/libpng16 $PREFIX/include/libpng
 
 QT="5"
 V4L="1"
+OPENVINO="1"
 
 if [[ "${target_platform}" == linux-* ]]; then
     # Looks like there's a bug in Opencv 3.2.0 for building with FFMPEG
@@ -20,6 +21,7 @@ if [[ "${target_platform}" == osx-* ]]; then
     V4L="0"
 elif [[ "${target_platform}" == linux-ppc64le ]]; then
     QT="0"
+    OPENVINO="0"
 fi
 
 
@@ -84,6 +86,7 @@ cmake -LAH -G "Ninja"                                                     \
     -DWITH_OPENCLAMDFFT=0                                                 \
     -DWITH_OPENCLAMDBLAS=0                                                \
     -DWITH_OPENCL_D3D11_NV=0                                              \
+    -DWITH_OPENVINO=$OPENVINO                                             \
     -DWITH_1394=0                                                         \
     -DWITH_OPENNI=0                                                       \
     -DWITH_HDF5=1                                                         \

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -0,0 +1,2 @@
+MACOSX_SDK_VERSION:            # [osx and x86_64]
+  - 10.12                      # [osx and x86_64]
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.7.0" %}
+{% set version = "4.8.0" %}
 {% 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: 8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
+    sha256: cbf47ecc336d2bff36b0dcd7d6c179a9bb59e805136af6b9670ca944aef889bd
     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: 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584
+    sha256: b4aef0f25a22edcd7305df830fa926ca304ea9db65de6ccd02f6cfa5f3357dbb
     folder: opencv_contrib
     patches:
       # Allow attempt to find HDF5 on cross-compile
@@ -50,7 +50,7 @@ source:
     sha256: 78884f64b564a3b06dc6ee731ed33b60c6d8cd864cea07f21d94ba0f90c7b310
 
 build:
-  number: 6
+  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
@@ -85,7 +85,7 @@ requirements:
   host:
     - python
     - numpy
-    - eigen
+    - eigen =3.4.0
     # Specify lgpl version of ffmpeg so that there are
     # no quesitons about the license of the resulting opencv
     # binary
@@ -106,6 +106,7 @@ requirements:
     - libwebp
     - qt-main                        # [not osx and not ppc64le]
     - zlib
+    - openvino                       # [not ppc64le]
 
 test:
     requires:
@@ -254,6 +255,7 @@ outputs:
         - if [[ $($PYTHON -c 'import cv2; print(cv2.__version__)') != $PKG_VERSION ]]; then exit 1; fi  # [unix]
         - python -c "import cv2; assert 'Unknown' not in cv2.videoio_registry.getBackendName(cv2.CAP_V4L)"  # [linux]
         - python -c "import cv2, re; assert re.search('Lapack:\s+YES', cv2.getBuildInformation())"
+        - pip check
         - pip list
         - test $(pip list | grep opencv-python | wc -l) -eq 1  # [unix]
       requires: