[aws-c-*] Update version (#13558)

* [many ports] Update version

* [aws-checksums] Add dependency aws-c-common

* update version

* port updates

* port updates

* Update ports/brotli/CONTROL

* [draco] fix uwp build

* [blosc] Fix win static build

* [blosc] fix unix build

* move changes to other PRs

* Remove unuse patches

11 files changed, 79 insertions, 76 deletions

diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL
index 712566e26..cc91c44f4 100644
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@@ -1,4 +1,4 @@
 Source: aws-c-common

-Version: 0.4.15

+Version: 0.4.56
 Homepage: https://github.com/awslabs/aws-c-common
 Description: AWS common library for C

diff --git a/ports/aws-c-common/disable-error-4068.patch b/ports/aws-c-common/disable-error-4068.patch
index 89735cc11..d03158174 100644
--- a/ports/aws-c-common/disable-error-4068.patch
+++ b/ports/aws-c-common/disable-error-4068.patch
@@ -1,15 +1,15 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 79c66c3..f6639d7 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -127,6 +127,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)

-     #this only gets applied to aws-c-common (not its consumers).

-     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)

- endif()

-+ 

-+if (WIN32)

-+    add_compile_options(/wd4068)

-+endif()

- 

- aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")

- target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8a7328..9b01f56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,6 +163,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+     target_compile_definitions(${PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+ endif()
+ 
++if (WIN32)
++    add_compile_options(/wd4068)
++endif()
++
+ aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
+ target_compile_definitions(${PROJECT_NAME} PRIVATE ${PLATFORM_DEFINES})
diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch
index cdf24606d..573d83773 100644
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@@ -1,20 +1,20 @@
-diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake

-index 42d146e..813f56d 100644

---- a/cmake/AwsCFlags.cmake

-+++ b/cmake/AwsCFlags.cmake

-@@ -39,15 +39,6 @@ function(aws_set_common_properties target)

-         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.

-         list(APPEND AWS_C_FLAGS /volatile:iso)

- 

--        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)

--        if(STATIC_CRT)

--            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")

--        else()

--            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")

--        endif()

--        string(REPLACE " " ";" _FLAGS "${_FLAGS}")

--        list(APPEND AWS_C_FLAGS "${_FLAGS}")

--

-     else()

-         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)

- 

+diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
+index 249b7d5..41a31e2 100644
+--- a/cmake/AwsCFlags.cmake
++++ b/cmake/AwsCFlags.cmake
+@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
+             list(APPEND AWS_C_FLAGS /DAWS_SUPPORT_WIN7=1)
+         endif()
+ 
+-        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
+-        if(STATIC_CRT)
+-            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        else()
+-            string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
+-        endif()
+-        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
+-        list(APPEND AWS_C_FLAGS "${_FLAGS}")
+-
+     else()
+         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
+ 
diff --git a/ports/aws-c-common/fix-cmake-target-path.patch b/ports/aws-c-common/fix-cmake-target-path.patch
index d2b5df81d..9ab97f679 100644
--- a/ports/aws-c-common/fix-cmake-target-path.patch
+++ b/ports/aws-c-common/fix-cmake-target-path.patch
@@ -1,28 +1,28 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 433b6c5..41874a0 100644
+index 9b01f56..3cc541d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -209,7 +209,7 @@ else()
+@@ -239,7 +239,7 @@ else()
  endif()
  
- install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
--    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}"
-+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+ install(EXPORT "${PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
++    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake"
      NAMESPACE AWS::
      COMPONENT Development)
  
 diff --git a/cmake/aws-c-common-config.cmake b/cmake/aws-c-common-config.cmake
-index c322b52..6e5daa0 100644
+index e495210..b7676c2 100644
 --- a/cmake/aws-c-common-config.cmake
 +++ b/cmake/aws-c-common-config.cmake
-@@ -1,9 +1,5 @@
- set(THREADS_PREFER_PTHREAD_FLAG ON)
- find_package(Threads REQUIRED)
+@@ -4,9 +4,5 @@ if(WIN32 OR UNIX OR APPLE)
+     find_package(Threads REQUIRED)
+ endif()
  
 -if (BUILD_SHARED_LIBS)
--    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
 -else()
--    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
 -endif()
 +include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
  
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index f9881d125..f3704ef05 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO awslabs/aws-c-common

-    REF e3e7ccd35a85f9cd38c67cb1988251f1543b6632 # v0.4.15
-    SHA512 f8be12628bb7503921bf64956697ad60ba1dc10099482515be7157a1f75b14fad716eadcf69af1d77a5f1bbdaf298a7913e678dd143c5b409dd37ce3bf57f023

+    REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
+    SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e

     HEAD_REF master

     PATCHES

         disable-error-4068.patch # This patch fixes dependency port compilation failure

diff --git a/ports/aws-c-event-stream/CONTROL b/ports/aws-c-event-stream/CONTROL
index 9b159651c..f19d28c36 100644
--- a/ports/aws-c-event-stream/CONTROL
+++ b/ports/aws-c-event-stream/CONTROL
@@ -1,4 +1,4 @@
 Source: aws-c-event-stream

-Version: 0.1.4

+Version: 0.1.6
 Description: C99 implementation of the vnd.amazon.event-stream content-type.

 Build-Depends: aws-c-common, aws-checksums
\ No newline at end of file
diff --git a/ports/aws-c-event-stream/fix-cmake-target-path.patch b/ports/aws-c-event-stream/fix-cmake-target-path.patch
index f862cb9ab..7b310ad0d 100644
--- a/ports/aws-c-event-stream/fix-cmake-target-path.patch
+++ b/ports/aws-c-event-stream/fix-cmake-target-path.patch
@@ -1,18 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a765be0..4ade373 100644
+index dddcc5d..55ff45f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -101,7 +101,7 @@ else()
+@@ -92,7 +92,7 @@ else()
  endif()
  
- install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
--    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
-+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
+ install(EXPORT "${PROJECT_NAME}-targets"
+-    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
++    DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
      NAMESPACE AWS::
      COMPONENT Development)
  
 diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake
-index 7bd3cfc..cb817e4 100644
+index e881cb8..cb817e4 100644
 --- a/cmake/aws-c-event-stream-config.cmake
 +++ b/cmake/aws-c-event-stream-config.cmake
 @@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)
@@ -20,9 +20,9 @@ index 7bd3cfc..cb817e4 100644
  find_dependency(aws-checksums)
  
 -if (BUILD_SHARED_LIBS)
--    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
 -else()
--    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
 -endif()
 +include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
  
diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake
index 8a641a19d..186253a45 100644
--- a/ports/aws-c-event-stream/portfile.cmake
+++ b/ports/aws-c-event-stream/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO awslabs/aws-c-event-stream

-    REF 32713d30b479690d199b3f02163a832b09b309a5 #v0.1.4

-    SHA512 c1f776b708cd4a68afbcc60e046dcfa3f7c1d378e7bf49ba7f93b3db3a248218316e5037254709320cd50efd6486996aa09678f41499fcea810adea16463ff4b

+    REF 873f1c035a5b6b4698280ee3798d1db5cc9ce86c # v0.1.6
+    SHA512 1d043b6915046498f5b94f9c23e0256ab780b11a75ad9ba3c608e26129567482a58787f4e69c4df3c21a29a6d13ed7dddc46869f695bb268e6867298b73edf30

     HEAD_REF master

     PATCHES fix-cmake-target-path.patch

 )

diff --git a/ports/aws-checksums/CONTROL b/ports/aws-checksums/CONTROL
index edbf6a40d..79a420c09 100644
--- a/ports/aws-checksums/CONTROL
+++ b/ports/aws-checksums/CONTROL
@@ -1,3 +1,4 @@
 Source: aws-checksums

-Version: 0.1.5

+Version: 0.1.9
 Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.

+Build-Depends: aws-c-common
\ No newline at end of file
diff --git a/ports/aws-checksums/fix-cmake-target-path.patch b/ports/aws-checksums/fix-cmake-target-path.patch
index ee740a688..101a5379f 100644
--- a/ports/aws-checksums/fix-cmake-target-path.patch
+++ b/ports/aws-checksums/fix-cmake-target-path.patch
@@ -1,25 +1,25 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2ae2229..c4d0c2d 100644
+index 888742b..efdd817 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@ else()
+@@ -140,7 +140,7 @@ else()
  endif()
  
- install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
--    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
-+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/"
-     NAMESPACE AWS::)
+ install(EXPORT "${PROJECT_NAME}-targets"
+-        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
++        DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
+         NAMESPACE AWS::
+         COMPONENT Development)
  
- configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
 diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake
-index f0785bf..1b9b2d2 100644
+index 6de2e44..84d55d1 100644
 --- a/cmake/aws-checksums-config.cmake
 +++ b/cmake/aws-checksums-config.cmake
-@@ -1,6 +1 @@
+@@ -1,6 +1,2 @@
 -if (BUILD_SHARED_LIBS)
--    include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake)
+-    include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake)
 -else()
--    include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake)
+-    include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake)
 -endif()
--
 +include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+ 
diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake
index 081278ea8..86ed6f24f 100644
--- a/ports/aws-checksums/portfile.cmake
+++ b/ports/aws-checksums/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO awslabs/aws-checksums

-    REF 519d6d9093819b6cf89ffff589a27ef8f83d0f65 # v0.1.5

-    SHA512 3079786d106b98ba3b8c254c26ec4d9accf5fba5bcc13aed30ffa897e17ea7d701e6b6e903b37534e32e1cf0cac3e9a6ff46e1340ed7c530c2fc6262b245e05c

+    REF fb96b3e964fe9bde2625c3ac9547e54d6c802211 # v0.1.9
+    SHA512 2cf63a462c900fae8ad101ecac8be6fd6ce3f796e3cecc1b3d19ffba364030d7468a7c7beab91594d2521cab5e99765c7b67fa2fef6f772457e04f75f59962cc

     HEAD_REF master

     PATCHES fix-cmake-target-path.patch

 )

@@ -16,7 +16,9 @@ endif()
 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

-    OPTIONS -DSTATIC_CRT=${STATIC_CRT_LNK}

+    OPTIONS

+        -DSTATIC_CRT=${STATIC_CRT_LNK}

+        -DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common # use extra cmake files

 )

 

 vcpkg_install_cmake()