[fftw3/libwebsockets/uwebsockets] Update to latest release (#20051)

3 files changed, 46 insertions, 49 deletions

diff --git a/ports/libwebsockets/export-include-path.patch b/ports/libwebsockets/export-include-path.patch
index 562c71285..fe589ca3c 100644
--- a/ports/libwebsockets/export-include-path.patch
+++ b/ports/libwebsockets/export-include-path.patch
@@ -1,48 +1,37 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 06d9eec..5606601 100644
+index f9b5557..ebc624b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -840,8 +840,8 @@ else()
-   set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets)
- endif()
+@@ -1045,8 +1045,8 @@ file(RELATIVE_PATH
+     "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
+     "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
  
 -if (DEFINED REL_INCLUDE_DIR)
 -    set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
 +if (1)
 +    set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include")
- endif() 
- 
- configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
-@@ -853,10 +853,6 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config-version.cmake.in
-                 ${PROJECT_BINARY_DIR}/libwebsockets-config-version.cmake 
-                 @ONLY)
+ endif()
  
--# Generate the config file for the build-tree.
--set(LWS__INCLUDE_DIRS 
--    "${PROJECT_SOURCE_DIR}/lib"
--    "${PROJECT_BINARY_DIR}")
- set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories")
  configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
-                 ${PROJECT_BINARY_DIR}/libwebsockets-config.cmake 
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 82b9170..eab2bf0 100644
+index 85b43d5..724f0b7 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -153,7 +153,7 @@ if (LWS_WITH_STATIC)
- 	add_library(websockets STATIC ${SOURCES})# ${HDR_PUBLIC})
- 	set_target_properties(websockets PROPERTIES LINKER_LANGUAGE C)
- 	list(APPEND LWS_LIBRARIES websockets)
+@@ -164,7 +164,7 @@ if (LWS_WITH_STATIC)
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
+ 	)
 -	target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
 +	target_include_directories(websockets PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
+ 	target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC)
  
  	if (WIN32)
- 		# Windows uses the same .lib ending for static libraries and shared
-@@ -173,7 +173,7 @@ if (LWS_WITH_SHARED)
- 	add_library(websockets_shared SHARED ${SOURCES} ${RESOURCES})# ${HDR_PUBLIC})
- 	set_target_properties(websockets_shared PROPERTIES LINKER_LANGUAGE C)
- 	list(APPEND LWS_LIBRARIES websockets_shared)
+@@ -190,7 +190,7 @@ if (LWS_WITH_SHARED)
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
+ 	)
 -	target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
 +	target_include_directories(websockets_shared PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
+ 	target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED)
  
  	# We want the shared lib to be named "libwebsockets"
- 	# not "libwebsocket_shared".
diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake
index c617c96ab..4bbaefbb8 100644
--- a/ports/libwebsockets/portfile.cmake
+++ b/ports/libwebsockets/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO warmcat/libwebsockets
-    REF 736f0739ed8c75db0e29c7678b5a9194e957c347 # v4.1.6
-    SHA512 7632439f8cdc87d275a0524b87ea5cd19c3401c1b7bb7fcf673eef3e1ab36c0ec022d2dce050d07bc106af3166575882507a56ac829a4361329311484dc2c5c4
+    REF 8d605f0649ed1ab6d27a443c7688598ea21fdb75 # v4.2.2
+    SHA512 824b7e7eded0fea41a1c22da8453b97a1ffd0f416e2d2ee3a23f799cfd449d1d0cc2f58de19a7d5dbd336e0ebceec16dd2a78cb80519d02bb49133047f99a9e2
     HEAD_REF master
     PATCHES
         fix-dependency-libuv.patch
@@ -132,9 +132,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED)
 # option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF)
 ##
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DLWS_WITH_STATIC=${LWS_WITH_STATIC}
         -DLWS_WITH_SHARED=${LWS_WITH_SHARED}
@@ -150,31 +149,33 @@ vcpkg_configure_cmake(
     # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libwebsockets)
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libwebsockets)
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server)
-file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake LIBWEBSOCKETSCONFIG_CMAKE)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server")
+file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" LIBWEBSOCKETSCONFIG_CMAKE)
 string(REPLACE "/../include" "/../../include" LIBWEBSOCKETSCONFIG_CMAKE "${LIBWEBSOCKETSCONFIG_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake "${LIBWEBSOCKETSCONFIG_CMAKE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake LIBWEBSOCKETSTARGETSDEBUG_CMAKE)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" "${LIBWEBSOCKETSCONFIG_CMAKE}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" LIBWEBSOCKETSTARGETSDEBUG_CMAKE)
 string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSDEBUG_CMAKE "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}")
-file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake LIBWEBSOCKETSTARGETSRELEASE_CMAKE)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" LIBWEBSOCKETSTARGETSRELEASE_CMAKE)
 string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSRELEASE_CMAKE "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}")
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}")
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     if (VCPKG_TARGET_IS_WINDOWS)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib)
+        file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib")
+        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/lib/websockets.lib")
     endif()
 endif ()
+
 vcpkg_copy_pdbs()
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json
index 897f6772b..e33c30a2e 100644
--- a/ports/libwebsockets/vcpkg.json
+++ b/ports/libwebsockets/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libwebsockets",
-  "version-semver": "4.1.6",
-  "port-version": 2,
+  "version-semver": "4.2.2",
   "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.",
   "homepage": "https://github.com/warmcat/libwebsockets",
   "supports": "!(arm | uwp)",
@@ -9,6 +8,14 @@
     "libuv",
     "openssl",
     "pthreads",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ]
 }