Prepare the MeVisLab thirdparty libraries for the 4.0.1 release

Author: usiems

recipes/7zip/conanfile.py

@@ -9,7 +9,7 @@
 
 class ConanRecipe(ConanFile):
     name = "7zip"
-    version = "23.01"
+    version = "24.06"
     license = ("LGPL-2.1-or-later", "BSD-3-Clause")
     homepage = "https://www.7-zip.org"
     description = "7-Zip is a file archiver with a high compression ratio"
@@ -37,9 +37,11 @@ def layout(self):
 
     def source(self):
         version = "".join(self.version.split("."))
-        get(self,
+        get(
+            self,
+            sha256="2aa1660c773525b2ed84d6cd7ff0680c786ec0893b87e4db44654dcb7f5ac8b5",
             url=f"https://sourceforge.net/projects/sevenzip/files/7-Zip/{self.version}/7z{version}-src.tar.xz",
-            sha256="356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74")
+        )
 
     def generate(self):
         tc = NMakeToolchain(self)

recipes/abseil/conanfile.py

@@ -8,7 +8,7 @@
 
 class ConanRecipe(ConanFile):
     name = "abseil"
-    version = "20240116.1"
+    version = "20240116.2"
     homepage = "https://abseil.io"
     description = "Collection of C++ libraries from Google"
     license = "Apache-2.0"
@@ -24,7 +24,7 @@ def layout(self):
     def source(self):
         get(
             self,
-            sha256="3c743204df78366ad2eaf236d6631d83f6bc928d1705dd0000b872e53b73dc6a",
+            sha256="733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc",
             url=f"https://github.com/abseil/abseil-cpp/archive/refs/tags/{self.version}.tar.gz",
             strip_root=True,
         )

recipes/assimp/conanfile.py

@@ -8,7 +8,7 @@
 
 class ConanRecipe(ConanFile):
     name = "assimp"
-    version = "5.3.1"
+    version = "5.4.1"
     homepage = "https://www.assimp.org"
     description = "library to import and export various 3d-model-formats including scene-post-processing to generate missing render data"
     license = "BSD-3-Clause"
@@ -23,10 +23,11 @@ def requirements(self):
         self.requires("zlib/[>=1.2.13]")
 
     def source(self):
-        get(self,
-            sha256="f4020735fe4601de9d85cb335115568cce0e027a65e546dd8895081696d624bd",
+        get(
+            self,
+            sha256="08837ee7c50b98ca72d2c9e66510ca6640681db8800aa2d3b1fcd61ccc615113",
             url=f"https://github.com/assimp/assimp/archive/v{self.version}.zip",
-            strip_root=True
+            strip_root=True,
         )
         patch(self, patch_file="patches/001-no_pkgconfig_minizip.patch")
         patch(self, patch_file="patches/002-zlib_names.patch")
@@ -51,7 +52,7 @@ def generate(self):
 
         if self.settings.os == "Windows":
             tc.preprocessor_definitions["NOMINMAX"] = 1
-        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW" # to avoid warnings
+        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"  # to avoid warnings
 
         tc.generate()
 

recipes/assimp/patches/001-no_pkgconfig_minizip.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75b160c..c253f36 100644
+index f1e2d2d..d01a0fc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -524,12 +524,12 @@ ENDIF()
+@@ -526,12 +526,12 @@ ENDIF()
 
  IF( NOT IOS )
    IF( NOT ASSIMP_BUILD_MINIZIP )

recipes/boost/conanfile.py

@@ -9,7 +9,7 @@
 from conan import ConanFile
 from conan.tools.build.flags import cppstd_flag
 from conan.tools.env import Environment
-from conan.tools.files import get, copy, collect_libs, files
+from conan.tools.files import get, copy, collect_libs, files, patch
 from conan.tools.microsoft import is_msvc
 from conan.tools.layout import basic_layout
 from conan.tools.microsoft.visual import msvc_version_to_toolset_version
@@ -21,7 +21,7 @@ class ConanRecipe(ConanFile):
     name = "boost"
     display_name = "Boost"
     mli_name = "None"
-    version = "1.84.0"
+    version = "1.85.0"
     homepage = "https://www.boost.org"
     description = "Boost provides free peer-reviewed portable C++ source libraries"
     license = "BSL-1.0"
@@ -68,11 +68,16 @@ def layout(self):
         basic_layout(self, src_folder="src")
 
     def source(self):
-        major, minor, patch = self.version.split(".")[:3]
-        get(self,
-            sha256="cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454",
-            url=f"https://boostorg.jfrog.io/artifactory/main/release/{self.version}/source/boost_{major}_{minor}_{patch}.tar.bz2",
-            strip_root=True
+        get(
+            self,
+            sha256="7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617",
+            url=f"https://boostorg.jfrog.io/artifactory/main/release/{self.version}/source/boost_{self.version.replace('.','_')}.tar.bz2",
+            strip_root=True,
+        )
+        patch(
+            self,
+            patch_file="patches/001-b2_update.patch",
+            patch_description="Update b2 to v5.2.1 for Boost 1.85.0 to fix build issues with newer MSVC versions",
         )
 
     def build(self):
@@ -81,12 +86,14 @@ def build(self):
         flags = self._get_build_flags()
         b2dir = self.source_path / "tools" / "build"
         b2exe = b2dir / ("b2.exe" if self.settings.os == "Windows" else "b2")
-        b2 = (f'{b2exe} {" ".join(flags)} '
-              f'-j{os.cpu_count()} '
-              f'--abbreviate-paths '
-              f'--debug-configuration '
-              f'--disable-icu '
-              f'--build-dir="{self.build_folder}"')
+        b2 = (
+            f'{b2exe} {" ".join(flags)} '
+            f"-j{os.cpu_count()} "
+            f"--abbreviate-paths "
+            f"--debug-configuration "
+            f"--disable-icu "
+            f'--build-dir="{self.build_folder}"'
+        )
 
         # to locate user config jam (BOOST_BUILD_PATH)
         with files.chdir(self, self.source_folder):
@@ -96,8 +103,7 @@ def build(self):
                 self.run(b2)
 
     def package(self):
-        copy(self, pattern="*", src=self.source_path / "boost",
-             dst=self.package_path / "include" / "boost", excludes="*/CMakeLists.txt")
+        copy(self, pattern="*", src=self.source_path / "boost", dst=self.package_path / "include" / "boost", excludes="*/CMakeLists.txt")
         copy(self, "LICENSE_1_0.txt", src=self.source_path, dst=self.package_path / "licenses")
 
         out_lib_dir = self.source_path / "stage" / "lib"
@@ -134,8 +140,7 @@ def package_info(self):
 
         self.cpp_info.components["diagnostic_definitions"].libs = []
         self.cpp_info.components["diagnostic_definitions"].defines = ["BOOST_LIB_DIAGNOSTIC"]
-        self.cpp_info.components["diagnostic_definitions"].set_property(
-            "cmake_target_name", f"Boost::diagnostic_definitions")
+        self.cpp_info.components["diagnostic_definitions"].set_property("cmake_target_name", f"Boost::diagnostic_definitions")
 
         # A target defined by CMake's original Boost find package and used by openvdb
         self.cpp_info.components["disable_autolinking"].libs = []
@@ -144,7 +149,7 @@ def package_info(self):
 
         for lib in collect_libs(self):
             # remove boost_ prefix and any suffix
-            comp = lib[lib.index("_") + 1:].split('-')[0]
+            comp = lib[lib.index("_") + 1 :].split("-")[0]
 
             self.output.info(f"creating component {comp}")
 
@@ -242,9 +247,9 @@ def _get_build_flags(self):
         zlib_info = self.dependencies["zlib"].cpp_info
         zlib_name = "zlib" if self.settings.os == "Windows" else "z"
         debug_suffix = "_d" if self.settings.build_type == "Debug" else ""
-        flags.append('-sZLIB_INCLUDE="%s"' % zlib_info.includedirs[0].replace('\\', '/'))
-        flags.append('-sZLIB_LIBPATH="%s"' % zlib_info.libdirs[0].replace('\\', '/'))
-        flags.append(f'-sZLIB_BINARY={zlib_name}{debug_suffix}')
+        flags.append('-sZLIB_INCLUDE="%s"' % zlib_info.includedirs[0].replace("\\", "/"))
+        flags.append('-sZLIB_LIBPATH="%s"' % zlib_info.libdirs[0].replace("\\", "/"))
+        flags.append(f"-sZLIB_BINARY={zlib_name}{debug_suffix}")
 
         flags.append("boost.locale.iconv=on")
         flags.append("boost.locale.icu=off")