From a085f9ed19b6e1b86841bbd5c6c3d8e74b697002 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 8 Dec 2021 01:53:22 -0800
Subject: [PATCH 1/2] [hiredis] Support windows dynamic build

---
 ports/hiredis/portfile.cmake | 9 +++++----
 ports/hiredis/vcpkg.json     | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake
index 7ba78cda34dddc..7c1da46ada96d5 100644
--- a/ports/hiredis/portfile.cmake
+++ b/ports/hiredis/portfile.cmake
@@ -1,5 +1,5 @@
-if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(HIREDIS_PATCHES support-static-in-win.patch)
 endif()
 
 vcpkg_from_github(
@@ -10,10 +10,10 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-feature-example.patch
-        support-static-in-win.patch
         fix-timeval.patch
         fix-include-path.patch
         fix-ssize_t.patch
+        ${HIREDIS_PATCHES}
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -31,6 +31,8 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
+vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_cmake_config_fixup()
 if("ssl" IN_LIST FEATURES)
@@ -39,4 +41,3 @@ endif()
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-vcpkg_fixup_pkgconfig()
diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json
index 32b9954975346c..aee055198b080a 100644
--- a/ports/hiredis/vcpkg.json
+++ b/ports/hiredis/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "hiredis",
   "version": "1.0.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Hiredis is a minimalistic C client library for the Redis database.",
   "homepage": "https://github.com/redis/hiredis",
-  "supports": "!(windows & !static)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

From 83f2668389090409fd1221d5cd00555f5a55909f Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 8 Dec 2021 01:54:40 -0800
Subject: [PATCH 2/2] versopm

---
 versions/baseline.json   | 2 +-
 versions/h-/hiredis.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index d91e4e87c03a8d..973cebdf8dfe39 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2698,7 +2698,7 @@
     },
     "hiredis": {
       "baseline": "1.0.2",
-      "port-version": 1
+      "port-version": 2
     },
     "hpx": {
       "baseline": "1.7.1",
diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json
index fb3ee3693dbed9..0821aee51a1bb4 100644
--- a/versions/h-/hiredis.json
+++ b/versions/h-/hiredis.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b651b36e6488f1eaaafc33d15d73d94751919f03",
+      "version": "1.0.2",
+      "port-version": 2
+    },
     {
       "git-tree": "0c7e16c5c3a9f612e1b46f96be41389b8ba11e6a",
       "version": "1.0.2",