From cdc6c6b9c8c9755ff4fb55d417e6fd0209e2213e Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <walbourn@users.noreply.github.com>
Date: Mon, 21 Jun 2021 14:20:45 -0700
Subject: [uvatlas, spectra] ports updated (#18404)

* [uvatlas, spectra] ports updated

* Update versions

* Minor code review

* Update version

* Code review feedback

* Update baseline
---
 ports/spectra/CONTROL        |  5 -----
 ports/spectra/portfile.cmake | 13 +++++++++++--
 ports/spectra/vcpkg.json     | 12 ++++++++++++
 ports/uvatlas/portfile.cmake | 12 +++++++++---
 ports/uvatlas/vcpkg.json     | 15 ++++++++++++---
 versions/baseline.json       |  4 ++--
 versions/s-/spectra.json     |  5 +++++
 versions/u-/uvatlas.json     |  5 +++++
 8 files changed, 56 insertions(+), 15 deletions(-)
 delete mode 100644 ports/spectra/CONTROL
 create mode 100644 ports/spectra/vcpkg.json

diff --git a/ports/spectra/CONTROL b/ports/spectra/CONTROL
deleted file mode 100644
index c1e872b83..000000000
--- a/ports/spectra/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: spectra
-Version: 0.9.0
-Description: A header-only C++ library for large scale eigenvalue problems
-Homepage: https://spectralib.org
-Build-Depends: eigen3
diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake
index bad7e4dbb..6fefd4abb 100644
--- a/ports/spectra/portfile.cmake
+++ b/ports/spectra/portfile.cmake
@@ -6,5 +6,14 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spectra RENAME copyright)
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/spectra/vcpkg.json b/ports/spectra/vcpkg.json
new file mode 100644
index 000000000..96bdfd299
--- /dev/null
+++ b/ports/spectra/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "spectra",
+  "version": "0.9.0",
+  "port-version": 1,
+  "description": "A header-only C++ library for large scale eigenvalue problems",
+  "homepage": "https://spectralib.org",
+  "documentation": "https://spectralib.org/quick-start.html",
+  "license": "MPL-2.0",
+  "dependencies": [
+    "eigen3"
+  ]
+}
diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
index d35e59779..a8888d05c 100644
--- a/ports/uvatlas/portfile.cmake
+++ b/ports/uvatlas/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/UVAtlas
-    REF jun2021
-    SHA512 f0ecba24c63214876f69eec2de7e5dd15e63aee20641e0989211f7dcab7182c7f6cb73960dbbc1504cd0fab18af8b024c8ee3bde087694d4acd3d1254b90f608
+    REF jun2021b
+    SHA512 d08bacacba324ddf60b003c5cbd5ad715bdbc1cf352a0dc9de58c40fd8f4bcbb562b8285ff1a443453399167a96e5b1af51d32ffc5e1e8f65391ef124c0706d4
     HEAD_REF master
 )
 
@@ -14,6 +14,12 @@ if (VCPKG_HOST_IS_LINUX)
     message(WARNING "Build ${PORT} requires GCC version 9 or later")
 endif()
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        eigen ENABLE_USE_EIGEN
+)
+
 if(VCPKG_TARGET_IS_UWP)
   set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF)
 else()
@@ -29,7 +35,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 
-if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
+if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES)))
   vcpkg_download_distfile(
     UVATLASTOOL_EXE
     URLS "https://github.com/Microsoft/UVAtlas/releases/download/jun2021/uvatlastool.exe"
diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json
index 2394f43e6..4f5a81fee 100644
--- a/ports/uvatlas/vcpkg.json
+++ b/ports/uvatlas/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "uvatlas",
-  "version-string": "jun2021",
+  "version-string": "jun2021b",
   "description": "UVAtlas isochart texture atlas",
-  "homepage": "http://go.microsoft.com/fwlink/?LinkID=512686",
+  "homepage": "https://github.com/Microsoft/UVAtlas",
   "documentation": "https://github.com/Microsoft/UVAtlas/wiki",
   "license": "MIT",
   "supports": "windows | linux",
@@ -17,5 +17,14 @@
       "name": "directxtex",
       "platform": "!(uwp | linux)"
     }
-  ]
+  ],
+  "features": {
+    "eigen": {
+      "description": "Use Eigen & Spectra for eigen-value computations",
+      "dependencies": [
+        "eigen3",
+        "spectra"
+      ]
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 1f20bf2df..50f0151b2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5918,7 +5918,7 @@
     },
     "spectra": {
       "baseline": "0.9.0",
-      "port-version": 0
+      "port-version": 1
     },
     "speex": {
       "baseline": "1.2.0",
@@ -6449,7 +6449,7 @@
       "port-version": 0
     },
     "uvatlas": {
-      "baseline": "jun2021",
+      "baseline": "jun2021b",
       "port-version": 0
     },
     "uvw": {
diff --git a/versions/s-/spectra.json b/versions/s-/spectra.json
index edabb0c53..0cfb2cd7d 100644
--- a/versions/s-/spectra.json
+++ b/versions/s-/spectra.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "79e61cb55ecfe0e16944d963259bf758b5405a74",
+      "version": "0.9.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b33cdb035b8b412b662a052b66437743330fccde",
       "version-string": "0.9.0",
diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json
index 21d07dec2..f4dd97775 100644
--- a/versions/u-/uvatlas.json
+++ b/versions/u-/uvatlas.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "60f3026412b95786a91eadb5e97483cb9539b8c1",
+      "version-string": "jun2021b",
+      "port-version": 0
+    },
     {
       "git-tree": "24f38b36247b90b011cb96c5b06728fa6b2f1011",
       "version-string": "jun2021",
-- 
cgit v1.2.3