From 61c166277f8de15ace592b08eecdcb46def75782 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Sat, 8 Jul 2023 00:04:03 +0800
Subject: [PATCH] [live555] update to 2023-06-20 (#32414)

* update version

* update version

* update version

* update version

* fix the use of operator

* update version
---
 ports/live555/CMakeLists.txt              |  1 +
 ports/live555/fix_operator_overload.patch | 13 +++++++++++++
 ports/live555/portfile.cmake              |  7 ++++---
 ports/live555/vcpkg.json                  |  3 +--
 versions/baseline.json                    |  4 ++--
 versions/l-/live555.json                  |  5 +++++
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 ports/live555/fix_operator_overload.patch

diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt
index 2e306c83a6..d5b71ea162 100644
--- a/ports/live555/CMakeLists.txt
+++ b/ports/live555/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 project(live555 C CXX)
 
+set(CMAKE_CXX_STANDARD 20)
 include_directories(
     BasicUsageEnvironment/include
     groupsock/include
diff --git a/ports/live555/fix_operator_overload.patch b/ports/live555/fix_operator_overload.patch
new file mode 100644
index 0000000000..09206185cc
--- /dev/null
+++ b/ports/live555/fix_operator_overload.patch
@@ -0,0 +1,13 @@
+diff --git a/liveMedia/MPEGVideoStreamFramer.cpp b/liveMedia/MPEGVideoStreamFramer.cpp
+index 59c4656..a705e68 100644
+--- a/liveMedia/MPEGVideoStreamFramer.cpp
++++ b/liveMedia/MPEGVideoStreamFramer.cpp
+@@ -129,7 +129,7 @@ void MPEGVideoStreamFramer
+     fPictureTimeBase = fFrameRate == 0.0 ? 0.0 : tc.pictures/fFrameRate;
+     fTcSecsBase = (((tc.days*24)+tc.hours)*60+tc.minutes)*60+tc.seconds;
+     fHaveSeenFirstTimeCode = True;
+-  } else if (fCurGOPTimeCode == fPrevGOPTimeCode) {
++  } else if (fCurGOPTimeCode.TimeCode::operator==(fPrevGOPTimeCode)) {
+     // The time code has not changed since last time.  Adjust for this:
+     fPicturesAdjustment += picturesSinceLastGOP;
+   } else {
diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake
index fedfdb368e..04843e9424 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://live555.com/liveMedia/public/live.2023.06.10.tar.gz"
-    FILENAME "live.2023.06.10.tar.gz"
-    SHA512 634f90db6339ebef6c6bc28f382034150e04e1bcc26d651da8823de7ed8a62bd648737fdf8be0c2734ba17a2516033af48e85b256170eaf30a2c484ede2d2004
+    URLS "http://live555.com/liveMedia/public/live.2023.06.20.tar.gz"
+    FILENAME "live.2023.06.20.tar.gz"
+    SHA512 dad8cb279aa020a50ffe0e049e37ba872df52da930a75f44abbd8b07db10ba4174b1b96c0a2f4f678972d167c1bab8c5fc2bdc5ef1916c43618f12134293f672
 )
 
 vcpkg_extract_source_archive(
@@ -11,6 +11,7 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE}"
     PATCHES
         fix-RTSPClient.patch
+        fix_operator_overload.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json
index 4467303c4d..d1434ef0ba 100644
--- a/ports/live555/vcpkg.json
+++ b/ports/live555/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "live555",
-  "version-date": "2023-06-10",
-  "port-version": 1,
+  "version-date": "2023-06-20",
   "description": "A complete RTSP server application",
   "homepage": "http://www.live555.com/liveMedia",
   "license": "GPL-3.0-or-later",
diff --git a/versions/baseline.json b/versions/baseline.json
index fc17e71afe..a675e0d28d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4961,8 +4961,8 @@
       "port-version": 2
     },
     "live555": {
-      "baseline": "2023-06-10",
-      "port-version": 1
+      "baseline": "2023-06-20",
+      "port-version": 0
     },
     "llfio": {
       "baseline": "2023-03-13",
diff --git a/versions/l-/live555.json b/versions/l-/live555.json
index 112411781b..1dd656796b 100644
--- a/versions/l-/live555.json
+++ b/versions/l-/live555.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3145196c0ec759988b77ab9ef787f426b0efc02d",
+      "version-date": "2023-06-20",
+      "port-version": 0
+    },
     {
       "git-tree": "e7944bec69900cba45393bcacfb4d903a3569300",
       "version-date": "2023-06-10",