From bded093da1285b9145d23653e4bdb7f76e9ceae9 Mon Sep 17 00:00:00 2001
From: Li Wu <wuli.rye@gmail.com>
Date: Tue, 20 Sep 2022 02:45:39 +0800
Subject: [PATCH] upgrade roaring to 0.7.1 (#26802)

Co-authored-by: Li Wu <wuli@yanhuangdata.com>
---
 ports/roaring/portfile.cmake | 11 +++++------
 ports/roaring/vcpkg.json     | 17 ++++++++++++++---
 versions/baseline.json       |  4 ++--
 versions/r-/roaring.json     |  5 +++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake
index 820e6f5db4..e058a246be 100644
--- a/ports/roaring/portfile.cmake
+++ b/ports/roaring/portfile.cmake
@@ -5,27 +5,26 @@ endif ()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO RoaringBitmap/CRoaring
-    REF ac3eaf56af8691374b63e53e842feff0322169f0
-    SHA512 db10331559df1503bcd25f7f5cab1fdf6b29984634dbfd54289cd7750032a1dd25cd0b57b490cac3d0d3fd5bc785730617536a7162c6e59f66fadb77f972b1c4
+    REF v0.7.1
+    SHA512 1d49da4e5b5ed0726feaf3608488e24f13c31358d1a72c7d0086fb6210313f73164745e0d1b616e8930073bbe259f7e1ac09fc97473b659694248f627c762f02
     HEAD_REF master
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC)
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC}
         -DENABLE_ROARING_TESTS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json
index 598893916e..dfbe9bed30 100644
--- a/ports/roaring/vcpkg.json
+++ b/ports/roaring/vcpkg.json
@@ -1,6 +1,17 @@
 {
   "name": "roaring",
-  "version-string": "2019-03-05",
-  "port-version": 3,
-  "description": "A better compressed bitset in C (and C++)"
+  "version": "0.7.1",
+  "description": "A better compressed bitset in C (and C++)",
+  "homepage": "https://github.com/RoaringBitmap/CRoaring",
+  "license": "Apache-2.0 OR MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index a6af8decf3..708b40ef94 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6441,8 +6441,8 @@
       "port-version": 0
     },
     "roaring": {
-      "baseline": "2019-03-05",
-      "port-version": 3
+      "baseline": "0.7.1",
+      "port-version": 0
     },
     "robin-hood-hashing": {
       "baseline": "3.11.5",
diff --git a/versions/r-/roaring.json b/versions/r-/roaring.json
index 4ec4c76165..469d922ab2 100644
--- a/versions/r-/roaring.json
+++ b/versions/r-/roaring.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "53f447b8e40bdaef2d1e693942505f95357e7279",
+      "version": "0.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "bd4d38440852b0d89e5bb4f1248f4090dcca5b8e",
       "version-string": "2019-03-05",