diff --git a/CMakeLists.txt b/CMakeLists.txt index 30e1476..108eb2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,11 +86,6 @@ else() if(NOT unpack_result STREQUAL "0") message(FATAL_ERROR "Fetching and compiling live555 failed!") endif() - message(STATUS "patch live555") - EXECUTE_PROCESS(COMMAND patch -d ${CMAKE_BINARY_DIR} -f -p 1 -i ${PROJECT_SOURCE_DIR}/patches/001_live555_sprintf_format RESULT_VARIABLE patch_result) - if(NOT patch_result STREQUAL "0") - message(FATAL_ERROR "Patching live555 failed! error:${patch_result}") - endif() endif() FILE(GLOB LIVESOURCE ${LIVE}/groupsock/*.c* ${LIVE}/liveMedia/*.c* ${LIVE}/UsageEnvironment/*.c* ${LIVE}/BasicUsageEnvironment/*.c*) if (NOT OpenSSL_FOUND) diff --git a/patches/001_live555_sprintf_format b/patches/001_live555_sprintf_format deleted file mode 100644 index a79e4d5..0000000 --- a/patches/001_live555_sprintf_format +++ /dev/null @@ -1,25 +0,0 @@ -From: Michel Promonet -Subject: [PATCH] Fix crash formating time_t as long (it is a long long) -Signed-off-by: Michel Promonet - ---- ---- a/live/liveMedia/ServerMediaSession.cpp -+++ b/live/liveMedia/ServerMediaSession.cpp -@@ -272,7 +272,7 @@ char* ServerMediaSession::generateSDPDes - - char const* const sdpPrefixFmt = - "v=0\r\n" -- "o=- %ld%06ld %d IN %s %s\r\n" -+ "o=- %lld%06lld %d IN %s %s\r\n" - "s=%s\r\n" - "i=%s\r\n" - "t=0 0\r\n" -@@ -300,7 +300,7 @@ char* ServerMediaSession::generateSDPDes - - // Generate the SDP prefix (session-level lines): - snprintf(sdp, sdpLength, sdpPrefixFmt, -- fCreationTime.tv_sec, fCreationTime.tv_usec, // o= -+ (long long)fCreationTime.tv_sec, (long long)fCreationTime.tv_usec, // o= - 1, // o= // (needs to change if params are modified) - addressFamily == AF_INET ? "IP4" : "IP6", // o=
- ipAddressStr.val(), // o=