From 592158c5025918c787844b0b90807e9d3c5d99ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 4 Aug 2022 17:38:23 +0000 Subject: [PATCH] [live555] Update to 2022-07-14 (#26144) * [live555] Update to 2022-07-14 * version * Update ports/live555/vcpkg.json Co-authored-by: Javier Matos Denizac * Update versions/l-/live555.json Co-authored-by: Javier Matos Denizac --- ports/live555/fix-RTSPClient.patch | 8 ++++---- ports/live555/portfile.cmake | 6 +++--- ports/live555/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/live555/fix-RTSPClient.patch b/ports/live555/fix-RTSPClient.patch index 66863963da..f63894e274 100644 --- a/ports/live555/fix-RTSPClient.patch +++ b/ports/live555/fix-RTSPClient.patch @@ -1,10 +1,10 @@ diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp -index 02c46c7..6127698 100644 +index 130baa9..8e1ea10 100644 --- a/liveMedia/RTSPClient.cpp +++ b/liveMedia/RTSPClient.cpp -@@ -1939,7 +1939,7 @@ int RTSPClient::write(const u_int8_t* data, unsigned count) { - if (fTLS.isNeeded) { - return fTLS.write(data, count); +@@ -2022,7 +2022,7 @@ int RTSPClient::write(const char* data, unsigned count) { + if (fOutputTLS->isNeeded) { + return fOutputTLS->write(data, count); } else { - return send(fOutputSocketNum, data, count, 0); + return send(fOutputSocketNum, (const char *)data, count, 0); diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index b11e4d076b..107d8b331f 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live.2022.04.26.tar.gz" - FILENAME "live.2022.04.26.tar.gz" - SHA512 0226a451129df1d47d10bc96ef2a9ab8ffb0116fd0daac8b16a1dd57b319b9058b587955a01bc4a939c3f64659915815fe182c8c7b02cb286313ff132dcbe144 + URLS "http://www.live555.com/liveMedia/public/live.2022.07.14.tar.gz" + FILENAME "live.2022.07.14.tar.gz" + SHA512 382544d9d9fe200699669a1f3301efb4ccec0193499c95b532ea923c380b1ec6fa721a4118d36a447ba9df08575f185498f244293c66bbe97cff0482eab033c7 ) vcpkg_extract_source_archive_ex( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index cff2518383..4bc17cc430 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,8 +1,8 @@ { "name": "live555", - "version-date": "2022-05-05", + "version-date": "2022-07-14", "description": "A complete RTSP server application", - "homepage": "https://www.live555.com/liveMedia", + "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", "dependencies": [ "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 1d9b94fb07..043dbf069c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4333,7 +4333,7 @@ "port-version": 0 }, "live555": { - "baseline": "2022-05-05", + "baseline": "2022-07-14", "port-version": 0 }, "llfio": { diff --git a/versions/l-/live555.json b/versions/l-/live555.json index df73995423..c7e600765b 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f99761c9c260c5b654cd1028610b2edaa3036e0", + "version-date": "2022-07-14", + "port-version": 0 + }, { "git-tree": "7dd605bbfb6b2532b7c127eac435600750b3c601", "version-date": "2022-05-05",