From 87ae70da914eeff6c98c5700d61f8fb8b58f893b Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:58:31 +0200
Subject: [PATCH] [open62541] add amalgamation feature (#16969)

* [open62541] add amalgamation features

* version stuff

* Update versions/baseline.json

* Update ports/open62541/vcpkg.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* update version file

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
---
 ports/open62541/CONTROL        | 14 --------------
 ports/open62541/portfile.cmake |  1 +
 ports/open62541/vcpkg.json     | 28 ++++++++++++++++++++++++++++
 versions/baseline.json         |  2 +-
 versions/o-/open62541.json     |  5 +++++
 5 files changed, 35 insertions(+), 15 deletions(-)
 delete mode 100644 ports/open62541/CONTROL
 create mode 100644 ports/open62541/vcpkg.json

diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL
deleted file mode 100644
index 1c000d539ed..00000000000
--- a/ports/open62541/CONTROL
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: open62541
-Version: 1.1.2
-Homepage: https://open62541.org
-Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.
-Supports: !uwp
-Default-Features: openssl
-
-Feature: openssl
-Description: Enable encryption support (uses OpenSSL)
-Build-Depends: openssl
-
-Feature: mbedtls
-Description: Enable encryption support (uses MbedTLS)
-Build-Depends: mbedtls
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
index 91f05456043..55fbd6edb9a 100644
--- a/ports/open62541/portfile.cmake
+++ b/ports/open62541/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     openssl UA_ENABLE_ENCRYPTION_OPENSSL
     mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS
+    amalgamation UA_ENABLE_AMALGAMATION
 )
 
 vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json
new file mode 100644
index 00000000000..5e0841e7c72
--- /dev/null
+++ b/ports/open62541/vcpkg.json
@@ -0,0 +1,28 @@
+{
+  "name": "open62541",
+  "version": "1.1.2",
+  "port-version": 1,
+  "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
+  "homepage": "https://open62541.org",
+  "supports": "!uwp",
+  "default-features": [
+    "openssl"
+  ],
+  "features": {
+    "amalgamation": {
+      "description": "Concatenate the library to a single file open62541.h/.c"
+    },
+    "mbedtls": {
+      "description": "Enable encryption support (uses MbedTLS)",
+      "dependencies": [
+        "mbedtls"
+      ]
+    },
+    "openssl": {
+      "description": "Enable encryption support (uses OpenSSL)",
+      "dependencies": [
+        "openssl"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index d37be89bb76..b62970cbe55 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4346,7 +4346,7 @@
     },
     "open62541": {
       "baseline": "1.1.2",
-      "port-version": 0
+      "port-version": 1
     },
     "openal-soft": {
       "baseline": "1.21.1",
diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json
index a8ada2e9573..a24c7cee80d 100644
--- a/versions/o-/open62541.json
+++ b/versions/o-/open62541.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "43c958ba9799820838fdf2332020ef83cacc4595",
+      "version": "1.1.2",
+      "port-version": 1
+    },
     {
       "git-tree": "3963c6ad1810891560f00a71c17f14ce53fe290e",
       "version-string": "1.1.2",