From 9189d2ec63a0cd94750c120c580409121d8852a5 Mon Sep 17 00:00:00 2001
From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
Date: Mon, 7 Mar 2022 03:24:32 +0100
Subject: [PATCH] [yato] fix arm build by updating

---
 ports/yato/portfile.cmake | 25 ++++++++-----------------
 ports/yato/vcpkg.json     | 13 ++++++++++---
 scripts/ci.baseline.txt   |  3 ---
 versions/baseline.json    |  4 ++--
 versions/y-/yato.json     |  5 +++++
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/ports/yato/portfile.cmake b/ports/yato/portfile.cmake
index e0b7a916b6e377..7626249b6b24dd 100644
--- a/ports/yato/portfile.cmake
+++ b/ports/yato/portfile.cmake
@@ -1,8 +1,8 @@
-vcpkg_from_bitbucket(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO alexey_gruzdev/yato
-    REF v1.0
-    SHA512 631b870fd2704a03d9d66ef244f4e50968ae63da4fda0c7cd1f6ce2cea2b1e8b4506b0148cd1af1e133a70fd5d9cdc9d8c054edac6141118ee3c9427e186b270
+    REPO agruzdev/Yato
+    REF 9b5a49f6ec4169b67b9e5ffd11fdae9c238b0a3d
+    SHA512 41962839cd13a314a17fef5f6065d7c3ed9967832039ca31993105685d584307d00f17c1514f4acf855a71fd884a1104c2d9c6a4461be5d2d7cfdc50b1ea7bdb
     HEAD_REF master
 )
 
@@ -17,24 +17,15 @@ file(COPY "${SOURCE_PATH}/modules/config/yato"
      DESTINATION "${CURRENT_PACKAGES_DIR}/include"
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DYATO_BUILD_TESTS:BOOL=OFF
         -DYATO_BUILD_ACTORS:BOOL=ON
         -DYATO_BUILD_CONFIG:BOOL=ON
-        -DYATO_CONFIG_MANUAL:BOOL=ON
-        -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
-        -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
-        -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
-        -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
 )
 
-vcpkg_build_cmake()
+vcpkg_cmake_build()
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/yato)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/yato/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/yato/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/yato/vcpkg.json b/ports/yato/vcpkg.json
index 7a5840b6ffaaad..d854276ce54311 100644
--- a/ports/yato/vcpkg.json
+++ b/ports/yato/vcpkg.json
@@ -1,6 +1,13 @@
 {
   "name": "yato",
-  "version-string": "1.0",
-  "port-version": 3,
-  "description": "Modern C++14 containers and utilities, actors system, typesafe config"
+  "version-date": "2022-03-06",
+  "description": "Modern C++14 containers and utilities, actors system, typesafe config",
+  "license": "Apache-2.0",
+  "supports": "!(windows & arm)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 2e9b92c02102e7..302b9aaae2256f 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1360,9 +1360,6 @@ yajl:arm-uwp=fail
 yajl:x64-uwp=fail
 yara:arm-uwp=fail
 yara:x64-uwp=fail
-yato:arm64-windows=fail
-yato:arm-uwp=fail
-yato:x64-uwp=fail
 z3:arm-uwp=fail
 z3:x64-uwp=fail
 
diff --git a/versions/baseline.json b/versions/baseline.json
index 9eee1d13bb39df..345c4b81defcde 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7533,8 +7533,8 @@
       "port-version": 1
     },
     "yato": {
-      "baseline": "1.0",
-      "port-version": 3
+      "baseline": "2022-03-06",
+      "port-version": 0
     },
     "yoga": {
       "baseline": "1.19.0",
diff --git a/versions/y-/yato.json b/versions/y-/yato.json
index 6a7e311f8ef73e..856103ad3cb7c3 100644
--- a/versions/y-/yato.json
+++ b/versions/y-/yato.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "302773e4845f27896621a44a76a964baec26f3e8",
+      "version-date": "2022-03-06",
+      "port-version": 0
+    },
     {
       "git-tree": "8605c052211c8394b3f3a524ffe071307582a941",
       "version-string": "1.0",