5 files changed, 83 insertions, 46 deletions
diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL
deleted file mode 100644
index 8b31a73b6..000000000
--- a/ports/folly/CONTROL
+++ /dev/null
@@ -1,31 +0,0 @@
-Source: folly
-Version: 2020.10.19.00
-Homepage: https://github.com/facebook/folly
-Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
-Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr, fmt
-Default-Features: zlib
-Supports: x64
-
-Feature: zlib
-Build-Depends: zlib
-Description: Support zlib for compression
-
-Feature: bzip2
-Build-Depends: bzip2
-Description: Support bzip2 for compression
-
-Feature: lzma
-Build-Depends: liblzma
-Description: Support LZMA for compression
-
-Feature: zstd
-Build-Depends: zstd
-Description: Support zstd for compression
-
-Feature: snappy
-Build-Depends: snappy
-Description: Support Snappy for compression
-
-Feature: lz4
-Build-Depends: lz4
-Description: Support lz4 for compression
diff --git a/ports/folly/fix-windows-minmax.patch b/ports/folly/fix-windows-minmax.patch
new file mode 100644
index 000000000..1fc69a43a
--- /dev/null
+++ b/ports/folly/fix-windows-minmax.patch
@@ -0,0 +1,12 @@
+diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
+index ec2ce1a1d..16deda71c 100644
+--- a/CMake/FollyCompilerMSVC.cmake
++++ b/CMake/FollyCompilerMSVC.cmake
+@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET)
+   # And the extra defines:
+   target_compile_definitions(${THETARGET}
+     PUBLIC
++      NOMINMAX
+       _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions.
+       _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
+       _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps.
diff --git a/ports/folly/missing-include-atomic.patch b/ports/folly/missing-include-atomic.patch
deleted file mode 100644
index 54c1a4817..000000000
--- a/ports/folly/missing-include-atomic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
-index 2891c4c..7c98975 100644
---- a/folly/portability/PThread.cpp
-+++ b/folly/portability/PThread.cpp
-@@ -28,6 +28,7 @@
- #include <mutex>
- #include <shared_mutex>
- #include <thread>
-+#include <atomic>
- 
- #include <folly/lang/Assume.h>
- #include <folly/portability/Windows.h>
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 3016caec9..a2e8a436e 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -12,14 +12,14 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
-    REF 430aa0d8db79989dd56f8a0361fcb1c305618e41 # v2020.10.19.00
-    SHA512 d9f6aa0f7a8aee044c01af289d71e4c80d63e40ff128ac840663e3103d19cdd0da161a0b0d106493d950b9ac9a905c5e2abf8c1970c2f16b94dd95c0d1b1943e
+    REF v2021.06.14.00
+    SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c
     HEAD_REF master
     PATCHES
-        missing-include-atomic.patch
         reorder-glog-gflags.patch
         disable-non-underscore-posix-names.patch
         boost-1.70.patch
+        fix-windows-minmax.patch
 )
 
 file(COPY
diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
new file mode 100644
index 000000000..e7762e6cf
--- /dev/null
+++ b/ports/folly/vcpkg.json
@@ -0,0 +1,68 @@
+{
+  "name": "folly",
+  "version-string": "2021.06.14.00",
+  "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
+  "homepage": "https://github.com/facebook/folly",
+  "supports": "x64",
+  "dependencies": [
+    "boost-chrono",
+    "boost-context",
+    "boost-conversion",
+    "boost-crc",
+    "boost-date-time",
+    "boost-filesystem",
+    "boost-multi-index",
+    "boost-program-options",
+    "boost-regex",
+    "boost-smart-ptr",
+    "boost-system",
+    "boost-thread",
+    "double-conversion",
+    "fmt",
+    "gflags",
+    "glog",
+    "libevent",
+    "openssl"
+  ],
+  "default-features": [
+    "zlib"
+  ],
+  "features": {
+    "bzip2": {
+      "description": "Support bzip2 for compression",
+      "dependencies": [
+        "bzip2"
+      ]
+    },
+    "lz4": {
+      "description": "Support lz4 for compression",
+      "dependencies": [
+        "lz4"
+      ]
+    },
+    "lzma": {
+      "description": "Support LZMA for compression",
+      "dependencies": [
+        "liblzma"
+      ]
+    },
+    "snappy": {
+      "description": "Support Snappy for compression",
+      "dependencies": [
+        "snappy"
+      ]
+    },
+    "zlib": {
+      "description": "Support zlib for compression",
+      "dependencies": [
+        "zlib"
+      ]
+    },
+    "zstd": {
+      "description": "Support zstd for compression",
+      "dependencies": [
+        "zstd"
+      ]
+    }
+  }
+}