From f4aa70af40af94411c9dbc160e531c4657489127 Mon Sep 17 00:00:00 2001 From: Marcus O Date: Mon, 17 Jun 2024 20:43:08 +0200 Subject: [PATCH] [libwebsockets] Update to version 4.3.3 (#39302) --- ports/libwebsockets/fix-find-openssl.patch | 11 ----------- ports/libwebsockets/portfile.cmake | 5 ++--- ports/libwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libwebsockets.json | 5 +++++ 5 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 ports/libwebsockets/fix-find-openssl.patch diff --git a/ports/libwebsockets/fix-find-openssl.patch b/ports/libwebsockets/fix-find-openssl.patch deleted file mode 100644 index 4bd45af3bd..0000000000 --- a/ports/libwebsockets/fix-find-openssl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt ---- a/lib/tls/CMakeLists.txt (revision a5aae049b2a386712e1be3b417915c0d44c7e675) -+++ b/lib/tls/CMakeLists.txt (date 1642427956730) -@@ -257,7 +257,6 @@ - find_package(PkgConfig QUIET) - pkg_check_modules(PC_OPENSSL openssl QUIET) - find_package(OpenSSL REQUIRED) -- list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES}) - set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} PARENT_SCOPE) - endif() - set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}") diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 6a4419c464..b0c2cca385 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets - REF b0a749c8e7a8294b68581ce4feac0e55045eb00b # v4.3.2 - SHA512 48c1d59cfdbe6cc043a51e950a614273bd2f9bbfd0ab8436e4ba30bf119cfdbc3e691c02608e8c169356ec79ca96472340d98d17659b66ee60bb998f3695d3c4 + REF 4415e84c095857629863804e941b9e1c2e9347ef # v4.3.3 + SHA512 11aed4ce06af0ef94ce3eaaf32cc2b5735be140dfcda1768cc8ccb0ed97c7bc7bdbb1b2718c6d6ef6a9058de208ba94cae85eedc1c597656300a4181060e31ff HEAD_REF master PATCHES fix-dependency-libuv.patch fix-build-error.patch export-include-path.patch - fix-find-openssl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LWS_WITH_STATIC) diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index c835c97ec4..bd2206ca91 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libwebsockets", - "version-semver": "4.3.2", + "version-semver": "4.3.3", "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": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index cc7b94c685..93fec413b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5189,7 +5189,7 @@ "port-version": 1 }, "libwebsockets": { - "baseline": "4.3.2", + "baseline": "4.3.3", "port-version": 0 }, "libx11": { diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index 84e63d6111..1b8396141f 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7df1a4ed19820c5790ae0c231213fb568bf3fb62", + "version-semver": "4.3.3", + "port-version": 0 + }, { "git-tree": "c8e1982ef72a330a813aafd1734c728a662701b1", "version-semver": "4.3.2",