Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opencv: add version 4.11.0 #26706

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −3
Open

opencv: add version 4.11.0 #26706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions recipes/opencv/4.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
sources:
"4.11.0":
- url: "https://github.com/opencv/opencv/archive/refs/tags/4.11.0.tar.gz"
sha256: "9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f"
- url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.11.0.tar.gz"
sha256: "2dfc5957201de2aa785064711125af6abb2e80a64e2dc246aca4119b19687041"
"4.10.0":
- url: "https://github.com/opencv/opencv/archive/refs/tags/4.10.0.tar.gz"
sha256: "b2171af5be6b26f7a06b1229948bbb2bdaa74fcf5cd097e0af6378fce50a6eb9"
Expand Down Expand Up @@ -30,6 +35,28 @@ sources:
- url: "https://github.com/opencv/opencv_contrib/archive/refs/tags/4.1.2.tar.gz"
sha256: "0f6c3d30baa39e3e7611afb481ee86dea45dafb182cac87d570c95dccd83eb8b"
patches:
"4.11.0":
- patch_file: "patches/4.5.5-0001-find-openexr.patch"
patch_description: "Robust discovery & injection of OpenEXR"
patch_type: "conan"
- patch_file: "patches/4.5.5-0003-find-quirc.patch"
patch_description: "Robust discovery & injection of quirc"
patch_type: "conan"
- patch_file: "patches/4.8.1-0001-find-ade.patch"
patch_description: "Robust discovery & injection of ade"
patch_type: "conan"
- patch_file: "patches/4.5.1-0001-tracking-no-plot-deps.patch"
patch_description: "Fix requirements of tracking module"
patch_type: "conan"
- patch_file: "patches/4.1.2-0006-hdf.patch"
patch_description: "Robust discovery of hdf"
patch_type: "conan"
- patch_file: "patches/4.11.0-0001-fix-zlib-static-android.patch"
patch_description: "Fix discovery of zlib static if Android"
patch_type: "conan"
- patch_file: "patches/4.1.2-0007-android-install-layout.patch"
patch_description: "Honor install layout from conan if Android"
patch_type: "conan"
"4.10.0":
- patch_file: "patches/4.5.5-0001-find-openexr.patch"
patch_description: "Robust discovery & injection of OpenEXR"
Expand Down
9 changes: 6 additions & 3 deletions recipes/opencv/4.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def config_options(self):
elif Version(self.version) < "4.3.0":
self.options.with_jpeg2000 = "jasper"

if "arm" not in self.settings.arch:
if "arm" not in self.settings.arch or Version(self.version) >= "4.11.0":
del self.options.neon
if not self._has_with_tiff_option:
del self.options.with_tiff
Expand Down Expand Up @@ -1471,8 +1471,6 @@ def generate(self):
if self.options.cpu_dispatch or self.options.cpu_dispatch == "":
tc.variables["CPU_DISPATCH"] = self.options.cpu_dispatch

tc.variables["ENABLE_NEON"] = self.options.get_safe("neon", False)

tc.variables["OPENCV_DNN_CUDA"] = self.options.get_safe("dnn_cuda", False)

if Version(self.version) >= "4.6.0":
Expand Down Expand Up @@ -1501,6 +1499,11 @@ def generate(self):
tc.variables["WITH_OBSENSOR"] = False
tc.variables["WITH_ZLIB_NG"] = False

if Version(self.version) >= "4.11.0":
tc.variables["WITH_HAL_RVV"] = False
else:
tc.variables["ENABLE_NEON"] = self.options.get_safe("neon", False)

# Special world option merging all enabled modules into one big library file
tc.variables["BUILD_opencv_world"] = self.options.world

Expand Down
23 changes: 23 additions & 0 deletions recipes/opencv/4.x/patches/4.11.0-0001-fix-zlib-static-android.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@@ -20,18 +20,18 @@ if(BUILD_ZLIB)
ocv_clear_vars(ZLIB_FOUND)
else()
ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
- if(ANDROID)
+ if(0)
set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES .so)
endif()
if(QNX)
set(ZLIB_FOUND TRUE)
set(ZLIB_LIBRARY z)
set(ZLIB_LIBRARIES z)
else()
find_package(ZLIB "${MIN_VER_ZLIB}")
endif()
- if(ANDROID)
+ if(0)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
endif()
2 changes: 2 additions & 0 deletions recipes/opencv/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"4.11.0":
folder: "4.x"
"4.10.0":
folder: "4.x"
"4.9.0":
Expand Down