From 675adc7e8558bd39b8ee6946f17475839d601cd4 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Wed, 14 Jul 2021 04:06:51 +0800
Subject: [PMDK] update to 1.11 (#18848)

* [PMDK] update to 1.11.0

* update version

* remove patch

* update version
---
 ports/pmdk/CONTROL                          |  5 -----
 ports/pmdk/portfile.cmake                   |  8 +++-----
 ports/pmdk/remove-non-ascii-character.patch | 17 -----------------
 ports/pmdk/vcpkg.json                       |  7 +++++++
 versions/baseline.json                      |  2 +-
 versions/p-/pmdk.json                       |  5 +++++
 6 files changed, 16 insertions(+), 28 deletions(-)
 delete mode 100644 ports/pmdk/CONTROL
 delete mode 100644 ports/pmdk/remove-non-ascii-character.patch
 create mode 100644 ports/pmdk/vcpkg.json

diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL
deleted file mode 100644
index 2c84efbfd..000000000
--- a/ports/pmdk/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: pmdk
-Version: 1.9
-Homepage: https://github.com/pmem/pmdk
-Description: Persistent Memory Development Kit
-Supports: !(arm|x86)
\ No newline at end of file
diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake
index 6f436e969..60d53e11a 100644
--- a/ports/pmdk/portfile.cmake
+++ b/ports/pmdk/portfile.cmake
@@ -2,16 +2,14 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 
 vcpkg_fail_port_install(ON_ARCH "arm" "x86")
 
-set(PMDK_VERSION "1.9")
+set(PMDK_VERSION "1.11.0")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pmem/pmdk
-    REF 1926ffb8f3f5f0617b3b3ed32029d437c272f187 #Commit id corresponding to the version 1.9
-    SHA512 dc828866291f1c4a6901de5845d21a60eb2c7951c6b5ebc680b309a4e5f7596b0d9bea663f997dff9f08f666124850aecd2219caf12bab571b4c2b63db28ec7f
+    REF 8583fcfd68764ac6779e6f93db89b06971b26704 #Commit id corresponding to the version 1.11.0
+    SHA512 6d0a9697c97f75ac10e9e8736c2397c6ee23c26af96b65c746e0c32bc2d16f083b177e52bc399aa93c6f2e29ac6106c2696c6bbf9779788d9d19167ac07000b8
     HEAD_REF master
-    PATCHES
-        remove-non-ascii-character.patch
 )
 
 # Build only the selected projects
diff --git a/ports/pmdk/remove-non-ascii-character.patch b/ports/pmdk/remove-non-ascii-character.patch
deleted file mode 100644
index a133bee95..000000000
--- a/ports/pmdk/remove-non-ascii-character.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/libpmemobj/critnib.c b/src/libpmemobj/critnib.c
-index 41fec79..f201dbd 100644
---- a/src/libpmemobj/critnib.c
-+++ b/src/libpmemobj/critnib.c
-@@ -360,9 +360,9 @@ alloc_leaf(struct critnib *__restrict c)
-  * crinib_insert -- write a key:value pair to the critnib structure
-  *
-  * Returns:
-- *  • 0 on success
-- *  • EEXIST if such a key already exists
-- *  • ENOMEM if we're out of memory
-+ *  0 on success
-+ *  EEXIST if such a key already exists
-+ *  ENOMEM if we're out of memory
-  *
-  * Takes a global write lock but doesn't stall any readers.
-  */
diff --git a/ports/pmdk/vcpkg.json b/ports/pmdk/vcpkg.json
new file mode 100644
index 000000000..b51a613f0
--- /dev/null
+++ b/ports/pmdk/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "pmdk",
+  "version": "1.11.0",
+  "description": "Persistent Memory Development Kit",
+  "homepage": "https://github.com/pmem/pmdk",
+  "supports": "!(arm | x86)"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index f6150ef34..339691058 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4905,7 +4905,7 @@
       "port-version": 0
     },
     "pmdk": {
-      "baseline": "1.9",
+      "baseline": "1.11.0",
       "port-version": 0
     },
     "pngpp": {
diff --git a/versions/p-/pmdk.json b/versions/p-/pmdk.json
index ab02e859f..e8e653c48 100644
--- a/versions/p-/pmdk.json
+++ b/versions/p-/pmdk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a2083c3fd577af1074c046235d2d0c73ad77d011",
+      "version": "1.11.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f71d109fdac523675cae5c60bb81194e654de8f6",
       "version-string": "1.9",
-- 
cgit v1.2.3