From 7ef1cf340bd768f14dcb559a31e1264d2b100799 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Mon, 18 Dec 2023 22:22:40 +0100
Subject: [PATCH] [aws-sdk-cpp] Update, minor fixes (#35721)

---
 .../aws-sdk-cpp/fix-awsmigrationhub-build.patch | 10 ----------
 ports/aws-sdk-cpp/portfile.cmake                | 17 +++++++++--------
 ports/aws-sdk-cpp/vcpkg.json                    |  3 +--
 versions/a-/aws-sdk-cpp.json                    |  5 +++++
 versions/baseline.json                          |  4 ++--
 5 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch

diff --git a/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch b/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch
deleted file mode 100644
index c2d9803013..0000000000
--- a/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt
-index a8a888d..574b985 100644
---- a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt
-+++ b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_project(aws-cpp-sdk-AWSMigrationHub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core)
-+add_project(aws-cpp-sdk-awsmigrationhub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core)
- 
- file(GLOB AWS_AWSMIGRATIONHUB_HEADERS
-     "include/aws/AWSMigrationHub/*.h"
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 1dc66c5f4b..b7f676f468 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -4,17 +4,16 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
     REF "${VERSION}"
-    SHA512 4410eaff815ce7b6c0bc0d37bd4175754d5103d2e3cfd60755df57dad103ab7e7705b79fc6039d2c8b7d1ccec650912f5ff0aa73baa2d9cf6d6608a493d11088
+    SHA512 1288e462881fba65462922a7ffe920eb3d72483c349a20ddae0d9e9ac1c0a0cee2959a76a451127bcee680f510023a6466757d11e5a08bf3624f73bb0c204598
     PATCHES
         patch-relocatable-rpath.patch
         fix-aws-root.patch
         lock-curl-http-and-tls-settings.patch
-        fix-awsmigrationhub-build.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
 
-set(EXTRA_ARGS)
+set(EXTRA_ARGS "")
 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
     set(rpath "@loader_path")
 elseif (VCPKG_TARGET_IS_ANDROID)
@@ -30,6 +29,7 @@ else()
     set(rpath "\$ORIGIN")
 endif()
 
+string(REPLACE "awsmigrationhub" "AWSMigrationHub" targets "${FEATURES}")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
@@ -38,7 +38,7 @@ vcpkg_cmake_configure(
         "-DENABLE_UNITY_BUILD=ON"
         "-DENABLE_TESTING=OFF"
         "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}"
-        "-DBUILD_ONLY=${FEATURES}"
+        "-DBUILD_ONLY=${targets}"
         "-DBUILD_DEPS=OFF"
         "-DBUILD_SHARED_LIBS=OFF"
         "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF"
@@ -47,10 +47,11 @@ vcpkg_cmake_configure(
 )
 vcpkg_cmake_install()
 
-foreach(TARGET IN LISTS FEATURES)
-    vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+foreach(TARGET IN LISTS targets)
+    string(TOLOWER "aws-cpp-sdk-${TARGET}" package)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
 endforeach()
-vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")
+vcpkg_cmake_config_fixup(PACKAGE_NAME "awssdk" CONFIG_PATH "lib/cmake/AWSSDK")
 
 vcpkg_copy_pdbs()
 
@@ -80,7 +81,7 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/nuget"
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib)
     if(LIB_FILES)
         file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
index d41fe2bd21..b389fae0ae 100644
--- a/ports/aws-sdk-cpp/vcpkg.json
+++ b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
-  "version": "1.11.215",
-  "port-version": 1,
+  "version": "1.11.225",
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "license": "Apache-2.0",
diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json
index 70e2486cae..bee0696de6 100644
--- a/versions/a-/aws-sdk-cpp.json
+++ b/versions/a-/aws-sdk-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2390f58d566a9a1a25ae4cf7b7862e344eaff2b1",
+      "version": "1.11.225",
+      "port-version": 0
+    },
     {
       "git-tree": "eeab7418483a9b578bb186acde08a1130301e0a1",
       "version": "1.11.215",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8c36912176..2150d60be1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -405,8 +405,8 @@
       "port-version": 0
     },
     "aws-sdk-cpp": {
-      "baseline": "1.11.215",
-      "port-version": 1
+      "baseline": "1.11.225",
+      "port-version": 0
     },
     "azmq": {
       "baseline": "2023-03-23",