From e353c4bdda6e1f89b730abf411b26ecd2a0b5e86 Mon Sep 17 00:00:00 2001
From: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Date: Sat, 3 Apr 2021 03:53:07 +0800
Subject: [libarchive] Remove lzo from the default feature list (#16957)

* [libarchive] Remove lzo from the default feature list

* Update the baseline version
---
 ports/libarchive/CONTROL    | 36 --------------------------
 ports/libarchive/vcpkg.json | 63 +++++++++++++++++++++++++++++++++++++++++++++
 versions/baseline.json      |  2 +-
 versions/l-/libarchive.json |  5 ++++
 4 files changed, 69 insertions(+), 37 deletions(-)
 delete mode 100644 ports/libarchive/CONTROL
 create mode 100644 ports/libarchive/vcpkg.json

diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
deleted file mode 100644
index a16b6179e..000000000
--- a/ports/libarchive/CONTROL
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: libarchive
-Version: 3.4.3
-Port-Version: 3
-Homepage: https://github.com/libarchive/libarchive
-Description: Library for reading and writing streaming archives
-Build-Depends: zlib
-Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl, zstd
-Supports: !uwp
-
-Feature: bzip2
-Build-Depends: bzip2
-Description: BZip2 support
-
-Feature: zstd
-Build-Depends: zstd
-Description: zstd support
-
-Feature: libxml2
-Build-Depends: libxml2
-Description: Libxml2 support
-
-Feature: lz4
-Build-Depends: lz4
-Description: LZ4 support
-
-Feature: lzma
-Build-Depends: liblzma
-Description: LZMA support
-
-Feature: lzo
-Build-Depends: lzo
-Description: LZO support
-
-Feature: openssl
-Build-Depends: openssl
-Description: OpenSSL support
diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json
new file mode 100644
index 000000000..f70adef08
--- /dev/null
+++ b/ports/libarchive/vcpkg.json
@@ -0,0 +1,63 @@
+{
+  "name": "libarchive",
+  "version-semver": "3.4.3",
+  "port-version": 4,
+  "description": "Library for reading and writing streaming archives",
+  "homepage": "https://github.com/libarchive/libarchive",
+  "supports": "!uwp",
+  "dependencies": [
+    "zlib"
+  ],
+  "default-features": [
+    "bzip2",
+    "libxml2",
+    "lz4",
+    "lzma",
+    "openssl",
+    "zstd"
+  ],
+  "features": {
+    "bzip2": {
+      "description": "BZip2 support",
+      "dependencies": [
+        "bzip2"
+      ]
+    },
+    "libxml2": {
+      "description": "Libxml2 support",
+      "dependencies": [
+        "libxml2"
+      ]
+    },
+    "lz4": {
+      "description": "Lz4 support",
+      "dependencies": [
+        "lz4"
+      ]
+    },
+    "lzma": {
+      "description": "Lzma support",
+      "dependencies": [
+        "liblzma"
+      ]
+    },
+    "lzo": {
+      "description": "Lzo support",
+      "dependencies": [
+        "lzo"
+      ]
+    },
+    "openssl": {
+      "description": "Openssl support",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "zstd": {
+      "description": "Zstd support",
+      "dependencies": [
+        "zstd"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 4213607c2..822fd931b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2926,7 +2926,7 @@
     },
     "libarchive": {
       "baseline": "3.4.3",
-      "port-version": 3
+      "port-version": 4
     },
     "libass": {
       "baseline": "0.15.0",
diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json
index ebb092687..4d3ad5108 100644
--- a/versions/l-/libarchive.json
+++ b/versions/l-/libarchive.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1246e0e0cd6bc4f0987fa5f5a130dc3b2e071285",
+      "version-semver": "3.4.3",
+      "port-version": 4
+    },
     {
       "git-tree": "114dd98b5e7865923e2e06a1ffad5661b0aec246",
       "version-string": "3.4.3",
-- 
cgit v1.2.3