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/4.x: bump deps #21765

Merged
merged 13 commits into from
Jan 23, 2024
Merged

Opencv/4.x: bump deps #21765

Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b9a79b9
opencv/4.x: bump deps
ericLemanissier Nov 17, 2023
5f24d94
opencv/4.x: bump deps
ericLemanissier Nov 17, 2023
6911023
opencv/4.x: bump deps
ericLemanissier Nov 23, 2023
16fa97f
opencv/4.x: bump deps
ericLemanissier Nov 27, 2023
14f0ffb
opencv/4.x: bump deps
ericLemanissier Nov 29, 2023
ce6974f
opencv/4.x: bump deps
ericLemanissier Nov 30, 2023
4fb64c3
opencv/4.x: bump deps
ericLemanissier Dec 4, 2023
3967434
opencv/4.x: bump deps
ericLemanissier Dec 4, 2023
d1829f7
Update conanfile.py
ericLemanissier Dec 14, 2023
705199c
Update conanfile.py
ericLemanissier Dec 14, 2023
3c36bb8
revert gdal
ericLemanissier Jan 4, 2024
6debf07
downgrade qt to 5
ericLemanissier Jan 8, 2024
df6e71b
restore qt patch
ericLemanissier Jan 8, 2024
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: 12 additions & 15 deletions recipes/opencv/4.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,21 +1101,21 @@ def requirements(self):
if self.options.get_safe("with_gtk"):
self.requires("gtk/system")
if self.options.get_safe("with_qt"):
self.requires("qt/5.15.11")
self.requires("qt/6.6.1")
ericLemanissier marked this conversation as resolved.
Show resolved Hide resolved
if self.options.get_safe("with_wayland"):
self.requires("xkbcommon/1.6.0")
self.requires("wayland/1.22.0")
# imgcodecs module dependencies
if self.options.get_safe("with_avif"):
self.requires("libavif/1.0.1")
self.requires("libavif/1.0.2")
if self.options.get_safe("with_jpeg") == "libjpeg":
self.requires("libjpeg/9e")
elif self.options.get_safe("with_jpeg") == "libjpeg-turbo":
self.requires("libjpeg-turbo/3.0.0")
self.requires("libjpeg-turbo/3.0.1")
elif self.options.get_safe("with_jpeg") == "mozjpeg":
self.requires("mozjpeg/4.1.3")
self.requires("mozjpeg/4.1.5")
if self.options.get_safe("with_jpeg2000") == "jasper":
self.requires("jasper/4.0.0")
self.requires("jasper/4.1.0")
elif self.options.get_safe("with_jpeg2000") == "openjpeg":
self.requires("openjpeg/2.5.0")
if self.options.get_safe("with_png"):
Expand All @@ -1127,7 +1127,7 @@ def requirements(self):
if self.options.get_safe("with_webp"):
self.requires("libwebp/1.3.2")
if self.options.get_safe("with_gdal"):
self.requires("gdal/3.7.0")
self.requires("gdal/3.4.3")
AbrilRBS marked this conversation as resolved.
Show resolved Hide resolved
if self.options.get_safe("with_gdcm"):
self.requires("gdcm/3.0.21")
# objdetect module dependencies
Expand All @@ -1139,11 +1139,11 @@ def requirements(self):
self.requires("ffmpeg/4.4.4")
# freetype module dependencies
if self.options.freetype:
self.requires("freetype/2.13.0")
self.requires("harfbuzz/8.2.2")
self.requires("freetype/2.13.2")
self.requires("harfbuzz/8.3.0")
# hdf module dependencies
if self.options.hdf:
self.requires("hdf5/1.14.2")
self.requires("hdf5/1.14.3")
# ovis module dependencies
if self.options.ovis:
self.requires("ogre/1.10.2")
Expand Down Expand Up @@ -1210,11 +1210,11 @@ def build_requirements(self):
if not self._is_legacy_one_profile:
self.tool_requires("protobuf/<host_version>")
if self.options.get_safe("with_wayland"):
self.tool_requires("wayland-protocols/1.31")
self.tool_requires("wayland-protocols/1.32")
if not self._is_legacy_one_profile:
self.tool_requires("wayland/<host_version>")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.0.3")
self.tool_requires("pkgconf/2.1.0")

def source(self):
get(self, **self.conan_data["sources"][self.version][0], strip_root=True)
Expand Down Expand Up @@ -1290,10 +1290,7 @@ def _patch_sources(self):
)

## Cleanup RPATH
if Version(self.version) < "4.1.2":
install_layout_file = os.path.join(self.source_folder, "CMakeLists.txt")
else:
install_layout_file = os.path.join(self.source_folder, "cmake", "OpenCVInstallLayout.cmake")
install_layout_file = os.path.join(self.source_folder, "cmake", "OpenCVInstallLayout.cmake")
replace_in_file(self, install_layout_file,
"ocv_update(CMAKE_INSTALL_RPATH \"${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}\")",
"")
Expand Down