1010#
1111# By putting all the generated files in 1 package, this makes the build process
1212# much easier, at the expense of a few MBs in the 'lib' package.
13- {% set version = "4.12 .0" %}
14- {% set build_num = "1 " %}
13+ {% set version = "4.13 .0" %}
14+ {% set build_num = "0 " %}
1515{% set major_version = version.split('.')[0] %}
1616{% set PY_VER_MAJOR = PY_VER.split('.')[0] %}
1717{% set PY_VER_MINOR = PY_VER.split('.')[1] %}
@@ -28,18 +28,18 @@ package:
2828
2929source :
3030 - url : https://github.com/opencv/opencv/archive/{{ version }}.tar.gz
31- sha256 : 44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d
31+ sha256 : 1d40ca017ea51c533cf9fd5cbde5b5fe7ae248291ddf2af99d4c17cf8e13017d
3232 patches :
3333 # backport https://github.com/opencv/opencv/pull/21611 (unmerged as of 06/2023)
3434 - patches_opencv/0001-fix-operator-warnings-and-redundant-parameter.patch # [win]
3535 - patches_opencv/0001-Add-installation-of-pip-metadata-from-cmake.patch
3636 - patches_opencv/0001-Also-install-metadata-for-opencv-python-headless.patch
37- - patches_opencv/0002-delete-lines-that-download-opencv.patch
37+ # - patches_opencv/0002-delete-lines-that-download-opencv.patch
3838 - patches_opencv/0003-find-pkgconfig-on-windows.patch
3939 - patches_opencv/0004-fix-detection-for-protobuf-23.x.patch
40- - patches_opencv/0005-patch-qt6.patch
40+ # - patches_opencv/0005-patch-qt6.patch
4141 - url : https://github.com/opencv/opencv_contrib/archive/{{ version }}.tar.gz
42- sha256 : 4197722b4c5ed42b476d42e29beb29a52b6b25c34ec7b4d589c3ae5145fee98e
42+ sha256 : 1e0077a4fd2960a7d2f4c9e49d6ba7bb891cac2d1be36d7e8e47aa97a9d1039b
4343 folder : opencv_contrib
4444 patches :
4545 # Allow attempt to find HDF5 on cross-compile
@@ -85,7 +85,7 @@ outputs:
8585 host :
8686 - python
8787 - eigen 3.4.0
88- - ffmpeg {{ ffmpeg }}
88+ - ffmpeg 8.0.1
8989 - freetype {{ freetype }}
9090 - gst-plugins-base {{ gst_plugins_base }}
9191 - gstreamer {{ gstreamer }}
@@ -103,13 +103,13 @@ outputs:
103103 - libpng {{ libpng }}
104104 - libprotobuf {{ libprotobuf }}
105105 - libtiff {{ libtiff }}
106- - libwebp-base {{ libwebp }}
106+ - libwebp-base {{ libwebp_base }}
107107 - numpy {{ numpy }}
108108 - libopenjpeg {{ openjpeg }}
109109 - qtbase-devel {{ qt }} # [build_variant == "normal"]
110110 - qt5compat # [build_variant == "normal"]
111111 - libgl-devel {{ libgl }} # [linux]
112- - zlib {{ zlib }}
112+ - libzlib {{ libzlib }}
113113 run :
114114 - _openmp_mutex # [linux]
115115 - python
@@ -132,7 +132,7 @@ outputs:
132132 - libtiff
133133 - libwebp-base
134134 - qtbase # [build_variant == "normal"]
135- - zlib
135+ - libzlib
136136
137137 test :
138138 source_files :
0 commit comments