bump jasper

conan-io · Dec 21, 2022 · 36cbbfc · 36cbbfc
1 parent a57f9d2
commit 36cbbfc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/recipes/opencv/2.x/conanfile.py b/recipes/opencv/2.x/conanfile.py
@@ -80,8 +80,9 @@ def requirements(self):
         if self.options.with_png:
             self.requires("libpng/1.6.39")
         if self.options.with_jasper:
-            self.requires("jasper/2.0.33")
+            self.requires("jasper/3.0.6")
         if self.options.with_openexr:
+            # opencv 2.x doesn't support openexr >= 3
             self.requires("openexr/2.5.7")
         if self.options.with_tiff:
             self.requires("libtiff/4.4.0")

diff --git a/recipes/opencv/3.x/conanfile.py b/recipes/opencv/3.x/conanfile.py
@@ -95,8 +95,9 @@ def requirements(self):
         if self.options.with_png:
             self.requires("libpng/1.6.39")
         if self.options.with_jasper:
-            self.requires("jasper/2.0.33")
+            self.requires("jasper/3.0.6")
         if self.options.with_openexr:
+            # opencv 3.x doesn't support openexr >= 3
             self.requires("openexr/2.5.7")
         if self.options.with_tiff:
             self.requires("libtiff/4.4.0")

diff --git a/recipes/opencv/4.x/conanfile.py b/recipes/opencv/4.x/conanfile.py
@@ -184,13 +184,14 @@ def requirements(self):
         elif self.options.with_jpeg == "libjpeg-turbo":
             self.requires("libjpeg-turbo/2.1.4")
         if self.options.get_safe("with_jpeg2000") == "jasper":
-            self.requires("jasper/2.0.33")
+            self.requires("jasper/3.0.6")
         elif self.options.get_safe("with_jpeg2000") == "openjpeg":
             self.requires("openjpeg/2.5.0")
         if self.options.with_png:
             self.requires("libpng/1.6.39")
         if self.options.with_openexr:
             if Version(self.version) < "4.5.3":
+                # opencv < 4.5.3 doesn't support openexr >= 3
                 self.requires("openexr/2.5.7")
             else:
                 self.requires("openexr/3.1.5")