[live555] update to 2023-06-20 (#32414)

* update version

* update version

* update version

* update version

* fix the use of operator

* update version
This commit is contained in:
jim wang 2023-07-08 00:04:03 +08:00 committed by GitHub
parent d1e11918f5
commit 61c166277f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 7 deletions

View File

@ -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

View File

@ -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 {

View File

@ -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}")

View File

@ -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",

View File

@ -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",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3145196c0ec759988b77ab9ef787f426b0efc02d",
"version-date": "2023-06-20",
"port-version": 0
},
{
"git-tree": "e7944bec69900cba45393bcacfb4d903a3569300",
"version-date": "2023-06-10",