[blosc] Update to 1.21.3 (#28986)

* [blosc] Update to 1.21.3

* Update version

* [blosc] Update to 1.21.3

* update version

* [blosc] update to 1.21.3

* [blosc] Modify review comments

* [blosc]Modify CI Error

* [blosc]Modify review comments

* [blosc]Modify the patch name

* [blosc]modify CI error

* [blosc]update version

* [blosc]update version

* update version

* update version

* update git-tree

---------

Co-authored-by: Lily Wang <494550702@qq.com>

ports/blosc/0001-fix-CMake-config.patch

@@ -0,0 +1,117 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 54d4817..07b551a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,7 +134,7 @@ include(GNUInstallDirs)
+
+ if(NOT DEACTIVATE_LZ4)
+     if(PREFER_EXTERNAL_LZ4)
+-        find_package(LZ4)
++        find_package(LZ4 NAMES lz4 CONFIG REQUIRED)
+     else()
+         message(STATUS "Using LZ4 internal sources.")
+     endif()
+@@ -144,7 +144,7 @@ if(NOT DEACTIVATE_LZ4)
+ endif()
+
+ if(NOT DEACTIVATE_SNAPPY)
+-    find_package(Snappy)
++    find_package(Snappy CONFIG REQUIRED)
+     if(SNAPPY_FOUND)
+         message(STATUS "Activating support for SNAPPY.")
+         set(HAVE_SNAPPY TRUE)
+@@ -157,7 +157,7 @@ if(NOT DEACTIVATE_ZLIB)
+     # import the ZLIB_ROOT environment variable to help finding the zlib library
+     if(PREFER_EXTERNAL_ZLIB)
+         set(ZLIB_ROOT $ENV{ZLIB_ROOT})
+-        find_package(ZLIB)
++        find_package(ZLIB REQUIRED)
+         if(NOT ZLIB_FOUND )
+             message(STATUS "No zlib found.  Using internal sources.")
+         endif()
+@@ -171,7 +171,7 @@ endif()
+
+ if(NOT DEACTIVATE_ZSTD)
+     if(PREFER_EXTERNAL_ZSTD)
+-        find_package(Zstd)
++        find_package(zstd CONFIG REQUIRED)
+     else()
+         message(STATUS "Using ZSTD internal sources.")
+     endif()
+diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
+index 70f80a2..83d90d8 100644
+--- a/blosc/CMakeLists.txt
++++ b/blosc/CMakeLists.txt
+@@ -88,7 +88,7 @@ endif(WIN32)
+
+ if(NOT DEACTIVATE_LZ4)
+     if(LZ4_FOUND)
+-        set(LIBS ${LIBS} ${LZ4_LIBRARY})
++        set(LIBS ${LIBS} lz4::lz4)
+     else(LZ4_FOUND)
+         file(GLOB LZ4_FILES ${LZ4_LOCAL_DIR}/*.c)
+         set(SOURCES ${SOURCES} ${LZ4_FILES})
+@@ -98,7 +98,7 @@ endif(NOT DEACTIVATE_LZ4)
+
+ if(NOT DEACTIVATE_SNAPPY)
+     if(SNAPPY_FOUND)
+-        set(LIBS ${LIBS} ${SNAPPY_LIBRARY})
++        set(LIBS ${LIBS} Snappy::snappy)
+     else(SNAPPY_FOUND)
+         file(GLOB SNAPPY_FILES ${SNAPPY_LOCAL_DIR}/*.cc)
+         set(SOURCES ${SOURCES} ${SNAPPY_FILES})
+@@ -108,7 +108,7 @@ endif(NOT DEACTIVATE_SNAPPY)
+
+ if(NOT DEACTIVATE_ZLIB)
+     if(ZLIB_FOUND)
+-        set(LIBS ${LIBS} ${ZLIB_LIBRARY})
++        set(LIBS ${LIBS} ZLIB::ZLIB)
+     else(ZLIB_FOUND)
+         file(GLOB ZLIB_FILES ${ZLIB_LOCAL_DIR}/*.c)
+         set(SOURCES ${SOURCES} ${ZLIB_FILES})
+@@ -136,6 +136,7 @@ if (NOT DEACTIVATE_ZSTD)
+         set(ZSTD_FILES ${ZSTD_COMMON_FILES} ${ZSTD_COMPRESS_FILES}
+             ${ZSTD_DECOMPRESS_FILES} ${ZSTD_DICT_FILES})
+         set(SOURCES ${SOURCES} ${ZSTD_FILES})
++        set(LIBS ${LIBS} $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+         source_group("Zstd" FILES ${ZSTD_FILES})
+     endif (ZSTD_FOUND)
+ endif (NOT DEACTIVATE_ZSTD)
+@@ -207,7 +208,7 @@ endif()
+
+ if (BUILD_SHARED)
+     target_link_libraries(blosc_shared ${LIBS})
+-    target_include_directories(blosc_shared PUBLIC ${BLOSC_INCLUDE_DIRS})
++    target_include_directories(blosc_shared PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ endif()
+
+ if (BUILD_TESTS)
+@@ -222,7 +223,7 @@ if(BUILD_STATIC)
+         set_target_properties(blosc_static PROPERTIES PREFIX lib)
+     endif()
+     target_link_libraries(blosc_static ${LIBS})
+-    target_include_directories(blosc_static PUBLIC ${BLOSC_INCLUDE_DIRS})
++    target_include_directories(blosc_static PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ endif(BUILD_STATIC)
+
+ # install
+@@ -230,12 +231,14 @@ if(BLOSC_INSTALL)
+     install(FILES blosc.h blosc-export.h
+             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT DEV)
+     if(BUILD_SHARED)
+-        install(TARGETS blosc_shared
++        install(TARGETS blosc_shared EXPORT blosc-config
+                 LIBRARY COMPONENT LIB
+-                ARCHIVE COMPONENT DEV
+-                RUNTIME COMPONENT LIB)
++                ARCHIVE COMPONENT LIB
++                RUNTIME COMPONENT BIN)
+     endif(BUILD_SHARED)
+     if(BUILD_STATIC)
+-        install(TARGETS blosc_static COMPONENT DEV)
++        install(TARGETS blosc_static EXPORT blosc-config LIBRARY COMPONENT LIB)
+     endif(BUILD_STATIC)
+ endif(BLOSC_INSTALL)
++
++install(EXPORT blosc-config DESTINATION share/blosc)
+\ No newline at end of file

ports/blosc/portfile.cmake

@@ -1,45 +1,50 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Blosc/c-blosc
-    REF 9fae1c9acb659159321aca69aefcdbce663e2374 # v1.18.1
-    SHA512 6cc77832100041aca8f320e44aa803adc0d3344b52742b995a3155b953e5d149534de65c8244d964448150b73715a81f54285d7d01f1b45d7b10fe07f5bdb141
+    REF "v${VERSION}"
+    SHA512 e9542aa2d1ebae9f6dcc12916d7ac3b920d771281ab96e2b2d59c2951e5f51d02d2684859b8823643d43d320613fb9dd8a3ea411ade34e66e323fcefa8165a91
     HEAD_REF master
     PATCHES
-      0001-find-deps.patch
-      0002-export-blosc-config.patch
+      0001-fix-CMake-config.patch
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(BLOSC_STATIC ON)
-    set(BLOSC_SHARED OFF)
-else()
-    set(BLOSC_STATIC OFF)
-    set(BLOSC_SHARED ON)
-endif()
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLOSC_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BLOSC_SHARED)
 
-file(REMOVE_RECURSE ${SOURCE_PATH}/internal-complibs)
+file(REMOVE_RECURSE "${SOURCE_PATH}/internal-complibs")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DPREFER_EXTERNAL_LZ4=ON
-            -DPREFER_EXTERNAL_SNAPPY=ON
-            -DPREFER_EXTERNAL_ZLIB=ON
-            -DPREFER_EXTERNAL_ZSTD=ON
-            -DBUILD_TESTS=OFF
-            -DBUILD_BENCHMARKS=OFF
-            -DBUILD_STATIC=${BLOSC_STATIC}
-            -DBUILD_SHARED=${BLOSC_SHARED}
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DPREFER_EXTERNAL_LZ4=ON
+        -DPREFER_EXTERNAL_ZLIB=ON
+        -DPREFER_EXTERNAL_ZSTD=ON
+        -DBUILD_TESTS=OFF
+        -DBUILD_FUZZERS=OFF
+        -DBUILD_BENCHMARKS=OFF
+        -DBUILD_STATIC=${BLOSC_STATIC}
+        -DBUILD_SHARED=${BLOSC_SHARED}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/blosc)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT})
 
-# cleanup
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/blosc-config.cmake"
+    [[# Generated by CMake]]
+    [[# Generated by CMake 
+include(CMakeFindDependencyMacro)
+find_dependency(lz4 CONFIG)
+find_dependency(zstd CONFIG)
+find_dependency(Snappy CONFIG)
+find_dependency(ZLIB)
+find_dependency(Threads)]]
+)
 
+# cleanup
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSES/BLOSC.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/blosc RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSES/BLOSC.txt")
 
 vcpkg_fixup_pkgconfig()

ports/blosc/vcpkg.json

@@ -1,12 +1,20 @@
 {
   "name": "blosc",
-  "version-string": "1.18.1",
-  "port-version": 4,
+  "version": "1.21.3",
   "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`",
   "homepage": "https://github.com/Blosc/c-blosc",
+  "license": "BSD-3-Clause",
   "dependencies": [
     "lz4",
     "snappy",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib",
     "zstd"
   ]

ports/openvdb/0003-fix-cmake.patch

@@ -57,7 +57,7 @@ index 5ff96f6..c3de6f9 100644
    if(OpenVDB_USES_ZLIB)
      list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
 diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
-index 1b48e84..46eeea4 100644
+index 1b48e84..5d055ac 100644
 --- a/openvdb/openvdb/CMakeLists.txt
 +++ b/openvdb/openvdb/CMakeLists.txt
 @@ -130,9 +130,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
@@ -109,12 +109,16 @@ index 1b48e84..46eeea4 100644
  else()
    message(WARNING "Blosc support is disabled. It is strongly recommended to "
      "enable blosc for optimal builds of OpenVDB and to support compatible "
-@@ -237,7 +218,7 @@ endif()
+@@ -237,7 +218,11 @@ endif()
  # /usr/local
 
  if(USE_BLOSC)
 -  list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
-+  list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc)
++    if(BUILD_SHARED_LIBS)
++    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_shared)
++  else()
++    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_static)
++  endif()
  endif()
 
  if(USE_BLOSC OR USE_ZLIB)

ports/openvdb/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "openvdb",
   "version": "10.0.0",
+  "port-version": 1,
   "description": "Sparse volume data structure and tools",
   "homepage": "https://github.com/dreamworksanimation/openvdb",
   "license": "MPL-2.0",

versions/b-/blosc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "08be7493a8b0644853e545f50d243680b1d13fd9",
+      "version": "1.21.3",
+      "port-version": 0
+    },
     {
       "git-tree": "a95e4b34ff47ed69f3e644405efe80b8c46aee14",
       "version-string": "1.18.1",