Prepare the MeVisLab thirdparty libraries for the 3.7.1 release

Author: mrbean-bremen

recipes/c-blosc/conandata.yml

@@ -1,16 +1,16 @@
 type: pure_c
 name: c-blosc
-version: "1.21.3"
+version: "1.21.4"
 homepage: https://www.blosc.org
 description: An extremely fast, multi-threaded, meta-compressor library
 license: BSD-3-Clause
 
 sources:
-  "1.21.3":
-    sha256: 941016c4564bca662080bb01aea74f06630bd665e598c6f6967fd91b2e2e0bb6
+  "1.21.4":
+    sha256: e72bd03827b8564bbb3dc3ea0d0e689b4863871ce3861d946f2efd7a186ecf3e
     url: https://github.com/Blosc/c-blosc/archive/refs/tags/v${version}.tar.gz
     base_path: c-blosc-${version}
 
 patches:
-  "1.21.3":
+  "1.21.4":
     - patch_file: patches/${version}-fix_cmake_find_package.cmake

recipes/c-blosc/conanfile.py

@@ -18,13 +18,10 @@ def requirements(self):
         self.requires("zlib/[>=1.2.11]" + channel)
         self.requires("zstd/[>=1.4.9]" + channel)
 
-
     def source(self):
         self.default_source()
-        shutil.copy2(os.path.join("sources", "LICENSES", "BLOSC.txt"), os.path.join("sources", "LICENSE"))
         tools.rmdir(os.path.join("sources", "internal-complibs"))
 
-
     def _configure_cmake(self):
         if not self._cmake:
             self.create_cmake_wrapper()
@@ -52,12 +49,10 @@ def _configure_cmake(self):
             self._cmake.configure()
         return self._cmake
 
-
     def build(self):
         cmake = self._configure_cmake()
         cmake.build()
 
-
     def package(self):
         cmake = self._configure_cmake()
         cmake.install()
@@ -69,7 +64,6 @@ def package(self):
         self.patch_binaries()
         self.default_package()
 
-
     def package_info(self):
         self.default_package_info()
         self.cpp_info.names["pkg_config"] = "blosc"

…ches/1.21.3-fix_cmake_find_package.cmake …ches/1.21.4-fix_cmake_find_package.cmakerecipes/c-blosc/patches/1.21.3-fix_cmake_find_package.cmake renamed to recipes/c-blosc/patches/1.21.4-fix_cmake_find_package.cmake recipes/c-blosc/patches/1.21.3-fix_cmake_find_package.cmake renamed to recipes/c-blosc/patches/1.21.4-fix_cmake_find_package.cmake

@@ -1,8 +1,8 @@
 diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 54d4817..e1fb580 100644
+index f726a0a..ce277e3 100644
 --- i/CMakeLists.txt
 +++ w/CMakeLists.txt
-@@ -136,7 +136,7 @@ if(NOT DEACTIVATE_LZ4)
+@@ -142,7 +142,7 @@ if(NOT DEACTIVATE_LZ4)
      if(PREFER_EXTERNAL_LZ4)
          find_package(LZ4)
      else()
@@ -11,16 +11,16 @@ index 54d4817..e1fb580 100644
      endif()
      # HAVE_LZ4 will be set to true because even if the library is
      # not found, we will use the included sources for it
-@@ -149,7 +149,7 @@ if(NOT DEACTIVATE_SNAPPY)
+@@ -155,7 +155,7 @@ if(NOT DEACTIVATE_SNAPPY)
          message(STATUS "Activating support for SNAPPY.")
          set(HAVE_SNAPPY TRUE)
      else()
 -        message(STATUS "SNAPPY *not* found.  De-activating support for it.")
-+        message(FATAL_ERROR "SNAPPY *not* found.  De-activating support for it.")
++        message(FATAL_ERROR "SNAPPY not found.")
      endif()
  endif()
-
-@@ -159,7 +159,7 @@ if(NOT DEACTIVATE_ZLIB)
+ 
+@@ -165,7 +165,7 @@ if(NOT DEACTIVATE_ZLIB)
          set(ZLIB_ROOT $ENV{ZLIB_ROOT})
          find_package(ZLIB)
          if(NOT ZLIB_FOUND )
@@ -29,12 +29,12 @@ index 54d4817..e1fb580 100644
          endif()
      else()
          message(STATUS "Using zlib internal sources.")
-@@ -173,7 +173,7 @@ if(NOT DEACTIVATE_ZSTD)
+@@ -179,7 +179,7 @@ if(NOT DEACTIVATE_ZSTD)
      if(PREFER_EXTERNAL_ZSTD)
          find_package(Zstd)
      else()
 -        message(STATUS "Using ZSTD internal sources.")
-+        message(FATAL_ERROR "No LZ4 found.")
++        message(FATAL_ERROR "No ZSTD found.")
      endif()
      # HAVE_ZSTD will be set to true because even if the library is
      # not found, we will use the included sources for it
@@ -45,12 +45,12 @@ index 2ae6d5f..96ca8e2 100644
 @@ -1,12 +1,12 @@
 -find_path(LZ4_INCLUDE_DIR lz4.h)
 +find_path(LZ4_INCLUDE_DIR lz4.h HINTS ${CONAN_INCLUDE_DIRS_LZ4})
-
+ 
  # On Windows, the lz4 library is called liblz4.lib, which is not
  # found by using the lz4 name.
 -find_library(LZ4_LIBRARY NAMES lz4 liblz4)
 +find_library(LZ4_LIBRARY NAMES ${CONAN_LIBS_LZ4} HINTS ${CONAN_LIB_DIRS_LZ4})
-
+ 
  if (LZ4_INCLUDE_DIR AND LZ4_LIBRARY)
      set(LZ4_FOUND TRUE)
      message(STATUS "Found LZ4 library: ${LZ4_LIBRARY}")
@@ -65,10 +65,10 @@ index 688d4d5..3793875 100644
 @@ -1,10 +1,10 @@
 -find_path(SNAPPY_INCLUDE_DIR snappy-c.h)
 +find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h HINTS ${CONAN_INCLUDE_DIRS_SNAPPY})
-
+ 
 -find_library(SNAPPY_LIBRARY NAMES snappy)
 +find_library(SNAPPY_LIBRARY NAMES ${CONAN_LIBS_SNAPPY} HINTS ${CONAN_LIB_DIRS_SNAPPY})
-
+ 
  if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARY)
      set(SNAPPY_FOUND TRUE)
      message(STATUS "Found SNAPPY library: ${SNAPPY_LIBRARY}")
@@ -83,10 +83,10 @@ index 7db4bb9..ded2dc7 100644
 @@ -1,10 +1,10 @@
 -find_path(ZSTD_INCLUDE_DIR zstd.h)
 +find_path(ZSTD_INCLUDE_DIR NAMES zstd.h HINTS ${CONAN_INCLUDE_DIRS_ZSTD})
-
+ 
 -find_library(ZSTD_LIBRARY NAMES zstd)
 +find_library(ZSTD_LIBRARY NAMES ${CONAN_LIBS_ZSTD} HINTS ${CONAN_LIB_DIRS_ZSTD})
-
+ 
  if (ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY)
      set(ZSTD_FOUND TRUE)
      message(STATUS "Found Zstd library: ${ZSTD_LIBRARY}")

recipes/fme/flann/conanfile.py

@@ -15,7 +15,7 @@ class ConanRecipe(ConanFile):
     def requirements(self):
         channel = f"@{self.user}/{self.channel}"
         self.requires("lz4/[>=1.9.3]" + channel)
-        self.requires("hdf5/[>=1.12.0]" + channel)
+        self.requires("hdf5/1.14.1-2" + channel)
 
 
     def source(self):

recipes/fme/vigra/conanfile.py

@@ -15,7 +15,7 @@ class ConanRecipe(ConanFile):
     def requirements(self):
         channel = f"@{self.user}/{self.channel}"
         self.requires("boost/[>=1.75.0]" + channel)
-        self.requires("hdf5/[>=1.12.0]" + channel)
+        self.requires("hdf5/1.14.1-2" + channel)
         self.requires("libpng/[>=1.6.37]" + channel)
         self.requires("tiff/[>=4.1.0]" + channel)
         self.requires("zlib/[>=1.2.11]" + channel)

recipes/hdf5/conandata.yml

@@ -2,17 +2,17 @@ pure_c: false
 header_only: false
 name: hdf5
 display_name: HDF5
-version: "1.14.0"
+version: "1.14.1-2"
 homepage: http://www.hdfgroup.org/HDF5/
 description: General purpose library and file format for storing scientific data
 license: BSD-3-Clause
 
 sources:
-  "1.14.0":
-    sha256: 375e25b505f6fb2c554d6055dfe909a2bd16351fddebf4c4268ad6cab1ced695
-    url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${version_major}.${version_minor}/hdf5-${version}/src/CMake-hdf5-${version}.tar.gz
+  "1.14.1-2":
+    sha256: a48be0762a3602fe1c52b924ec82987ca8690b085c287c18e9a1c5da8de90069
+    url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${version_major}.${version_minor}/hdf5-${version_major}.${version_minor}.${version_patch}/src/CMake-hdf5-${version}.tar.gz
     base_path: CMake-hdf5-${version}
 
 patches:
-  "1.14.0":
+  "1.14.1-2":
     - patch_file: patches/${version}-link_szip.patch

recipes/hdf5/patches/1.14.0-link_szip.patch

@@ -0,0 +1,28 @@
+diff --git i/hdf5-1.14.1-2/CMakeFilters.cmake w/hdf5-1.14.1-2/CMakeFilters.cmake
+index a55d7ae..ee7a36d 100644
+--- i/hdf5-1.14.1-2/CMakeFilters.cmake
++++ w/hdf5-1.14.1-2/CMakeFilters.cmake
+@@ -146,7 +146,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
+       if (NOT SZIP_FOUND)
+         find_package (SZIP) # Legacy find
+       endif ()
+-      if (SZIP_FOUND)
++      if (TRUE)
+         set (H5_HAVE_FILTER_SZIP 1)
+         set (H5_HAVE_SZLIB_H 1)
+         set (H5_HAVE_LIBSZ 1)
+@@ -172,12 +172,12 @@ if (HDF5_ENABLE_SZIP_SUPPORT)
+       set (H5_HAVE_LIBSZ 1)
+       message (VERBOSE "Filter SZIP is built")
+       message (VERBOSE "... with library AEC")
+-      set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
+     else ()
+       message (FATAL_ERROR "SZIP is Required for SZIP support in HDF5")
+     endif ()
+   endif ()
+-  INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
++  set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${CONAN_LIBS_LIBAEC})
++  INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS} ${CONAN_INCLUDE_DIRS_LIBAEC})
+   message (VERBOSE "Filter SZIP is ON")
+   if (H5_HAVE_FILTER_SZIP)
+     set (EXTERNAL_FILTERS "${EXTERNAL_FILTERS} DECODE")

recipes/hdf5/patches/1.14.1-2-link_szip.patch

@@ -1,21 +1,17 @@
 type: cpp
 name: icu
 display_name: ICU
-version: "73.1"
+version: "73.2"
 homepage: http://site.icu-project.org
 description: Unicode support, software internationalization, and software globalization
 license: ICU
 
 sha256:
-  "73.1":
-    src: a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45
-    data: 07d7557efb30fc2e9b74652f1525603b3209a4539d2d345d704e3df3bf9b957e
+  "73.2":
+    src: 818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
+    data: ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701
 
 patches:
-  "73.1":
+  "73.2":
     - patch_file: patches/${version}-disable_renaming_by_default.patch
       patch_description: disable renaming by default
-    - patch_file: patches/${version}-fix_uchar_api.patch
-      patch_description: |
-        Fix compile error when using `-DUCHAR_TYPE=`.
-        Changing the type was deprecated ages ago, but of course is still used today.