opencv 4.13.0

Author: OneAndOnlyDeadZero

recipe/build_opencv.sh

@@ -13,7 +13,9 @@ if [[ "${target_platform}" == linux-* ]]; then
     export CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
     OPENMP="-DWITH_OPENMP=1"
 elif [[ "${target_platform}" == osx-* ]]; then
-    CMAKE_ARGS="${CMAKE_ARGS} -D_LIBCPP_DISABLE_AVAILABILITY=ON -DOPENCV_SKIP_LINK_NO_UNDEFINED=ON -DOPENCV_SKIP_LINK_AS_NEEDED=ON -DCPU_BASELINE_DISABLE=NEON_BF16"
+    # We disable KleidiCV as clang has problem during compilation of 
+    # its sections of code: arm64-apple-darwin20.0: error: clang frontend command failed with exit code 139 (use -v to see invocation)
+    CMAKE_ARGS="${CMAKE_ARGS} -D_LIBCPP_DISABLE_AVAILABILITY=ON -DOPENCV_SKIP_LINK_NO_UNDEFINED=ON -DOPENCV_SKIP_LINK_AS_NEEDED=ON -DCPU_BASELINE_DISABLE=NEON_BF16 -DKLEIDICV_ENABLE_SVE2=OFF"
     V4L="0"
 fi
 

recipe/meta.yaml

@@ -10,8 +10,8 @@
 #
 # 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.12.0" %}
-{% set build_num = "1" %}
+{% set version = "4.13.0" %}
+{% set build_num = "0" %}
 {% set major_version = version.split('.')[0] %}
 {% set PY_VER_MAJOR = PY_VER.split('.')[0] %}
 {% set PY_VER_MINOR = PY_VER.split('.')[1] %}
@@ -28,18 +28,16 @@ package:
 
 source:
   - url: https://github.com/opencv/opencv/archive/{{ version }}.tar.gz
-    sha256: 44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d
+    sha256: 1d40ca017ea51c533cf9fd5cbde5b5fe7ae248291ddf2af99d4c17cf8e13017d
     patches:
       # backport https://github.com/opencv/opencv/pull/21611 (unmerged as of 06/2023)
       - patches_opencv/0001-fix-operator-warnings-and-redundant-parameter.patch  # [win]
       - patches_opencv/0001-Add-installation-of-pip-metadata-from-cmake.patch
       - patches_opencv/0001-Also-install-metadata-for-opencv-python-headless.patch
-      - patches_opencv/0002-delete-lines-that-download-opencv.patch
       - patches_opencv/0003-find-pkgconfig-on-windows.patch
       - patches_opencv/0004-fix-detection-for-protobuf-23.x.patch
-      - patches_opencv/0005-patch-qt6.patch
   - url: https://github.com/opencv/opencv_contrib/archive/{{ version }}.tar.gz
-    sha256: 4197722b4c5ed42b476d42e29beb29a52b6b25c34ec7b4d589c3ae5145fee98e
+    sha256: 1e0077a4fd2960a7d2f4c9e49d6ba7bb891cac2d1be36d7e8e47aa97a9d1039b
     folder: opencv_contrib
     patches:
       # Allow attempt to find HDF5 on cross-compile
@@ -85,7 +83,9 @@ outputs:
       host:
         - python
         - eigen 3.4.0
-        - ffmpeg {{ ffmpeg }}
+        # Request to rebuild with the latest ffmpeg
+        # which is not reflected in cbc.yaml yet
+        - ffmpeg 8.0.1
         - freetype {{ freetype }}
         - gst-plugins-base {{ gst_plugins_base }}
         - gstreamer {{ gstreamer }}
@@ -103,13 +103,13 @@ outputs:
         - libpng {{ libpng }}
         - libprotobuf {{ libprotobuf }}
         - libtiff {{ libtiff }}
-        - libwebp-base {{ libwebp }}
+        - libwebp-base {{ libwebp_base }}
         - numpy {{ numpy }}
         - libopenjpeg {{ openjpeg }}
         - qtbase-devel {{ qt }}  # [build_variant == "normal"]
         - qt5compat              # [build_variant == "normal"]
         - libgl-devel {{ libgl }}  # [linux]
-        - zlib {{ zlib }}
+        - libzlib {{ libzlib }}
       run:
         - _openmp_mutex         # [linux]
         - python
@@ -132,7 +132,7 @@ outputs:
         - libtiff
         - libwebp-base
         - qtbase          # [build_variant == "normal"]
-        - zlib
+        - libzlib
 
     test:
         source_files: