From 00158c0832dcfee0791d02e36642b4e85ba3fba8 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 2 Dec 2025 06:06:53 +0900 Subject: [PATCH] [libwebsockets] update to 4.5.0 (#48589) --- ports/libwebsockets/export-include-path.patch | 28 +++---------------- ports/libwebsockets/portfile.cmake | 2 +- ports/libwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libwebsockets.json | 5 ++++ 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/ports/libwebsockets/export-include-path.patch b/ports/libwebsockets/export-include-path.patch index 530d34f709..9a7ba43c04 100644 --- a/ports/libwebsockets/export-include-path.patch +++ b/ports/libwebsockets/export-include-path.patch @@ -1,7 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b) -+++ b/CMakeLists.txt (date 1669850632899) -@@ -1071,8 +1071,8 @@ +index e067e99..35dbddd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1230,8 +1230,8 @@ file(RELATIVE_PATH "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}" "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir. @@ -12,24 +13,3 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt endif() if (DEFINED OPENSSL_INCLUDE_DIRS) set(LWS__INCLUDE_DIRS "${LWS__INCLUDE_DIRS};${OPENSSL_INCLUDE_DIRS}") -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt ---- a/lib/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b) -+++ b/lib/CMakeLists.txt (date 1669850782017) -@@ -174,7 +174,7 @@ - $ - $ - ) -- target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS}) -+ target_include_directories(websockets PRIVATE $ PUBLIC $) - target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC) - target_include_directories(websockets PUBLIC ${LWS_PUBLIC_INCLUDES}) - set(LWS_PUBLIC_INCLUDES ${LWS_PUBLIC_INCLUDES} PARENT_SCOPE) -@@ -202,7 +202,7 @@ - $ - $ - ) -- target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS}) -+ target_include_directories(websockets_shared PRIVATE $ PUBLIC $) - target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED) - target_include_directories(websockets_shared PUBLIC ${LWS_PUBLIC_INCLUDES}) - set(LWS_PUBLIC_INCLUDES ${LWS_PUBLIC_INCLUDES} PARENT_SCOPE) diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 9348f6fb2d..8ab6733569 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets REF "v${VERSION}" - SHA512 86f85066ce0e9f7f29af5b7c7be803bd19f1a7e6afd8bcdd7c3afc1a66735324317852d7b19bbe9a5af69e759ec532dd28bebffa256f3e1c30ade7ead41a4275 + SHA512 25fc588088a712c4906b8a4c83524705bbed3b31494a70cc8455ddd10751d0978d942b21bf218400de1fee8e93dab6a4e0c942044bb36c31465567d5db7e5104 HEAD_REF master PATCHES fix-dependency-libuv.patch diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index 12f54b1ec9..3b28d494d8 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libwebsockets", - "version-semver": "4.4.1", + "version-semver": "4.5.0", "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://libwebsockets.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e9fbf19473..a1055afa59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5737,7 +5737,7 @@ "port-version": 2 }, "libwebsockets": { - "baseline": "4.4.1", + "baseline": "4.5.0", "port-version": 0 }, "libx11": { diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index d2e05b4f1e..2902ef1f3a 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1115704d2ab44a991d58f33bcb01e60a98475ce3", + "version-semver": "4.5.0", + "port-version": 0 + }, { "git-tree": "fa06af046274542c8e89ef49d93ad79a773e58aa", "version-semver": "4.4.1",