From d5595bff008286c6cfd4ffc85607216f867a5216 Mon Sep 17 00:00:00 2001
From: Sylvain Doremus <DragonJoker@users.noreply.github.com>
Date: Wed, 6 Apr 2022 23:18:50 +0200
Subject: [PATCH] [shaderwriter] Updated to version 2.2.0. (#23957)

* [shaderwriter] Updated to version 2.2.0.

* [shaderwriter] Trying to fix use of concepts with gcc.

* better git submodules

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
---
 ports/shaderwriter/portfile.cmake | 22 +++++++++-------------
 ports/shaderwriter/vcpkg.json     |  2 +-
 versions/baseline.json            |  2 +-
 versions/s-/shaderwriter.json     |  5 +++++
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake
index 2d80e3fba9..b785430a7b 100644
--- a/ports/shaderwriter/portfile.cmake
+++ b/ports/shaderwriter/portfile.cmake
@@ -1,24 +1,19 @@
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REPO DragonJoker/ShaderWriter
-    REF bcebc67feb99d98066dfb51a3857155ddcfa9d57
-    HEAD_REF master
-    SHA512 675a9db22c3593426c9a364a8a2934e41f65447d450347dd5683a89e4f38dfbc914dca7f6fbfa77b0afd1fb0fd12c2316c11eded1453ae4498b448ae2267fdac
+    REF 8b1b0614f49c27ab08ff16ce632fcac44f24d6d5
+    HEAD_REF development
+    SHA512 697ecfee5dc9cbfe3cc724b7acd90107ea40bba58448536b1726eb3755f8c96e77b9a31317b567d77ed9e9b5c6decede73c4c7f1a760f11eff0cba2711b3c548
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH
     REPO DragonJoker/CMakeUtils
-    REF 27747f5c91acf76107220986f114efdab0a09a68
+    REF acbce0a4966d0689148975aaa3c581af2b4e33a7
     HEAD_REF master
-    SHA512 acd5dafc74e197886a9b1ac52b59bdbf2d136cc8b49683eda48b8ccc45eced5f68aa334c8f9c01c7d8bf5c8908b64cbf19a97c6e3666370111bb3d2551c3b469
+    SHA512 f2f45520554b576b3896ef9068549878e05a57a8bd0a3a4ab8c218bba9dee49febfe8cb7edb85b8ff51bdd86dee576cace6b8506a6226484d2b640408a3246ba
 )
 
-get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY)
-if (EXISTS ${SRC_PATH}/CMake)
-    file(REMOVE_RECURSE ${SRC_PATH}/CMake)
-endif()
-file(RENAME ${CMAKE_SOURCE_PATH} ${SRC_PATH}/CMake)
-set(CMAKE_SOURCE_PATH ${SRC_PATH}/CMake)
-file(COPY ${CMAKE_SOURCE_PATH} DESTINATION ${SOURCE_PATH})
+file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
+file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 
@@ -31,9 +26,10 @@ vcpkg_cmake_configure(
         -DSDW_BUILD_TESTS=OFF
         -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC}
         -DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC}
+        -DSDW_UNITY_BUILD=ON
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shaderwriter)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json
index efd2516bb2..524382657b 100644
--- a/ports/shaderwriter/vcpkg.json
+++ b/ports/shaderwriter/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "shaderwriter",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.",
   "homepage": "https://github.com/DragonJoker/ShaderWriter",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index c582a84ad3..b0f68d655e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6429,7 +6429,7 @@
       "port-version": 2
     },
     "shaderwriter": {
-      "baseline": "2.1.0",
+      "baseline": "2.2.0",
       "port-version": 0
     },
     "shapelib": {
diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json
index 4c30efff0b..1e295e8e79 100644
--- a/versions/s-/shaderwriter.json
+++ b/versions/s-/shaderwriter.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09802faaae65b3f6ac6adfe5687bf581f0189dba",
+      "version": "2.2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e9ad5b26c40e2048a99c618972827c8f8e802eaa",
       "version": "2.1.0",