From af1ba4cf302c781a6236aa159d7bb346ef555dbd Mon Sep 17 00:00:00 2001
From: JonLiu1993 <13720414433@163.com>
Date: Thu, 29 Oct 2020 16:51:09 +0800
Subject: [PATCH 1/5] [lua] update to 5.4.1

---
 ports/lua/portfile.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index cc3c074654dad3..002e574c436b2b 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -35,7 +35,6 @@ if("cpp" IN_LIST FEATURES)
             -DSKIP_INSTALL_HEADERS=ON
             -DSKIP_INSTALL_TOOLS=ON
     )
-
     vcpkg_install_cmake()
 endif()
 

From 06c77a491be667e2b81847e8f8dfcf5e2883fd27 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <13720414433@163.com>
Date: Tue, 10 Nov 2020 15:34:20 +0800
Subject: [PATCH 2/5] Handling lua file conflicts

---
 ports/lua/portfile.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index 9441a89139cfcd..4ae72ff7403bc6 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -36,6 +36,7 @@ if("cpp" IN_LIST FEATURES)
             -DSKIP_INSTALL_TOOLS=ON
     )
     vcpkg_install_cmake()
+
 endif()
 
 vcpkg_copy_pdbs()

From acb4096bf9edac6692d2c30216588f49b04e6f0a Mon Sep 17 00:00:00 2001
From: JonLiu1993 <13720414433@163.com>
Date: Wed, 18 Nov 2020 10:38:33 +0800
Subject: [PATCH 3/5] [SUNDIALS] Update to 5.5.0

---
 ports/sundials/CONTROL                 |  2 +-
 ports/sundials/portfile.cmake          | 13 +++++++++----
 ports/sundials/uwp-c4703-warning.patch | 12 ------------
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 ports/sundials/uwp-c4703-warning.patch

diff --git a/ports/sundials/CONTROL b/ports/sundials/CONTROL
index ae45b9d88faa0c..fdd491a61b3585 100644
--- a/ports/sundials/CONTROL
+++ b/ports/sundials/CONTROL
@@ -1,4 +1,4 @@
 Source: sundials
-Version: 3.1.1-2
+Version: 5.5.0
 Homepage: https://computation.llnl.gov/projects/sundials
 Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)
diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake
index d5b52cac31b17f..9eabaa192a232b 100644
--- a/ports/sundials/portfile.cmake
+++ b/ports/sundials/portfile.cmake
@@ -1,22 +1,25 @@
-set(ARCHIVE_NAME "sundials-3.1.1")
+set(ARCHIVE_NAME "sundials-5.5.0")
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://computation.llnl.gov/projects/sundials/download/${ARCHIVE_NAME}.tar.gz"
     FILENAME "${ARCHIVE_NAME}.tar.gz"
-    SHA512 3e8fc7183c5503943f1ba00c73b04c1614a48b6e6cb90559ec5481f9acffaa19acd97bd961611b251ebdc032f1a13f0919b0ab0cdfe9d9b4ddc99d40bef5719f
+    SHA512 e8cba7341f6b8d647151fe5543e62a13adda363d4c96bdaba7a70925b2c58ec4f4f089a0d6c9c5a57c50fb32fa1285bd09b450697056bc3da24cf882c6c7c427
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    PATCHES
-        uwp-c4703-warning.patch
 )
 
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS -DEXAMPLES_ENABLE=OFF
+    -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
+    -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
 )
 
 vcpkg_install_cmake(DISABLE_PARALLEL)
@@ -53,3 +56,5 @@ if(REMOVE_DLLS)
 endif()
 
 vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
diff --git a/ports/sundials/uwp-c4703-warning.patch b/ports/sundials/uwp-c4703-warning.patch
deleted file mode 100644
index 3718753cfba5ae..00000000000000
--- a/ports/sundials/uwp-c4703-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4030f4d..afef556 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -602,6 +602,7 @@ MARK_AS_ADVANCED(FORCE SUNDIALS_DEVTESTS)
- 
- IF(WIN32)
-   ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-+  ADD_COMPILE_OPTIONS(/wd4703) # Needed for uwp
- ENDIF(WIN32)
- 
- IF(APPLE)

From ee4df27ef42040c0ed4b6aeb527e0f86b901d518 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <13720414433@163.com>
Date: Wed, 18 Nov 2020 14:21:25 +0800
Subject: [PATCH 4/5] Handling lua file conflicts

---
 ports/lua/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake
index 4ae72ff7403bc6..0d343cc6f38e6d 100644
--- a/ports/lua/portfile.cmake
+++ b/ports/lua/portfile.cmake
@@ -35,8 +35,8 @@ if("cpp" IN_LIST FEATURES)
             -DSKIP_INSTALL_HEADERS=ON
             -DSKIP_INSTALL_TOOLS=ON
     )
-    vcpkg_install_cmake()
 
+    vcpkg_install_cmake()
 endif()
 
 vcpkg_copy_pdbs()

From b2c1db60c7f7dfd8961e442e6b25ddcfff2f938e Mon Sep 17 00:00:00 2001
From: JonLiu1993 <13720414433@163.com>
Date: Wed, 18 Nov 2020 15:06:38 +0800
Subject: [PATCH 5/5] [SUNDIALS] Update to 5.5.0

---
 ports/sundials/portfile.cmake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake
index 9eabaa192a232b..9a5886f6549cca 100644
--- a/ports/sundials/portfile.cmake
+++ b/ports/sundials/portfile.cmake
@@ -17,9 +17,10 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED)
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DEXAMPLES_ENABLE=OFF
-    -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
-    -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
+    OPTIONS 
+        -DEXAMPLES_ENABLE=OFF
+        -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
+        -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
 )
 
 vcpkg_install_cmake(DISABLE_PARALLEL)
@@ -56,5 +57,4 @@ if(REMOVE_DLLS)
 endif()
 
 vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})