[azure-storage-cpp][cpp-redis][dirent][doctest][gdcm2][grpc][llvm][matio][spdlog][yaml-cpp] Upgrades

4 files changed, 15 insertions, 66 deletions

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 53ed862c2..5f001f04d 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 4.3.0
+Version: 4.3.1
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/fix-cmakelists.patch b/ports/cpp-redis/fix-cmakelists.patch
deleted file mode 100644
index 2839ce56f..000000000
--- a/ports/cpp-redis/fix-cmakelists.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae20868..01bb84c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,7 @@
- cmake_minimum_required(VERSION 2.8.7)
- set(CMAKE_MACOSX_RPATH 1)
- include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
-+include(${CMAKE_ROOT}/Modules/GenerateExportHeader.cmake)
- 
- 
- ###
-@@ -170,6 +171,8 @@ if(USE_CUSTOM_TCP_CLIENT)
-   set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_USE_CUSTOM_TCP_CLIENT=${USE_CUSTOM_TCP_CLIENT}")
- endif(USE_CUSTOM_TCP_CLIENT)
- 
-+generate_export_header(${PROJECT} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp)
-+target_include_directories(${PROJECT} PUBLIC ${CMAKE_BINARY_DIR})
- 
- ###
- # install
-@@ -181,6 +184,7 @@ install(DIRECTORY DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
- install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION lib USE_SOURCE_PERMISSIONS)
- install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DESTINATION bin USE_SOURCE_PERMISSIONS)
- install(DIRECTORY ${CPP_REDIS_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSIONS)
-+install (FILES ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp DESTINATION include/cpp_redis/misc)
- 
- 
- ###
diff --git a/ports/cpp-redis/fix-export.patch b/ports/cpp-redis/fix-export.patch
deleted file mode 100644
index 1b071c511..000000000
--- a/ports/cpp-redis/fix-export.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/includes/cpp_redis/misc/logger.hpp b/includes/cpp_redis/misc/logger.hpp
-index d79a98f..bfb33b9 100644
---- a/includes/cpp_redis/misc/logger.hpp
-+++ b/includes/cpp_redis/misc/logger.hpp
-@@ -26,6 +26,8 @@
- #include <mutex>
- #include <string>
- 
-+#include <cpp_redis/misc/cpp_redis_export.hpp>
-+
- namespace cpp_redis {
- 
- //!
-@@ -161,7 +163,7 @@ private:
- //! variable containing the current logger
- //! by default, not set (no logs)
- //!
--extern std::unique_ptr<logger_iface> active_logger;
-+extern CPP_REDIS_EXPORT std::unique_ptr<logger_iface> active_logger;
- 
- //!
- //! debug logging
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index ea0ea1194..9187e344f 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -3,21 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/cpp_redis
-    REF 4.3.0
-    SHA512 d4a2865b72b4dfa80b6d3c004245014a77e74d4a3d254d6b0a9d50e890a22dc3d9ce54688a8c9185ecee9bbf8cdf76046a9788c70887ccf8a08d5cdcef298b46
+    REF 4.3.1
+    SHA512 abf372542c53f37f504b3211b840b100d07a8f4b2e7f5584cc7550ab16ed617838e2df79064374c7a409458d8567f4834686318ea3a40249c767e36c744c7a47
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-export.patch
-)
-
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie)
 
-if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
     set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
 else()
     set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
@@ -43,16 +36,23 @@ file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
 foreach(file ${FILES})
     file(READ ${file} _contents)
     string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 1" _contents "${_contents}")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        string(REPLACE
+            "extern std::unique_ptr<logger_iface> active_logger;"
+            "extern __declspec(dllimport) std::unique_ptr<logger_iface> active_logger;"
+            _contents "${_contents}")
+    endif()
     file(WRITE ${file} "${_contents}")
 endforeach()
 
-file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
-file(COPY ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin)
+file(GLOB FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/cpp_redis.ilk" "${CURRENT_PACKAGES_DIR}/bin/cpp_redis.dll.manifest")
+if(FILES_TO_REMOVE)
+    file(REMOVE_RECURSE ${FILES_TO_REMOVE})
+endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()