diff options
| -rw-r--r-- | ports/live555/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/live555/CONTROL | 3 | ||||
| -rw-r--r-- | ports/live555/fix-RTSPClient.patch | 13 | ||||
| -rw-r--r-- | ports/live555/portfile.cmake | 8 |
4 files changed, 20 insertions, 6 deletions
diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt index 9d126cda1..cb0854bb2 100644 --- a/ports/live555/CMakeLists.txt +++ b/ports/live555/CMakeLists.txt @@ -20,6 +20,8 @@ add_library(groupsock ${GROUPSOCK_SRCS}) file(GLOB LIVEMEDIA_SRCS liveMedia/*.c liveMedia/*.cpp) add_library(liveMedia ${LIVEMEDIA_SRCS}) +find_package(OpenSSL REQUIRED) +target_include_directories(liveMedia PRIVATE "${OPENSSL_INCLUDE_DIR}") file(GLOB USAGE_ENVIRONMENT_SRCS UsageEnvironment/*.c UsageEnvironment/*.cpp) add_library(UsageEnvironment ${USAGE_ENVIRONMENT_SRCS}) diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL index e2f44db66..490972f09 100644 --- a/ports/live555/CONTROL +++ b/ports/live555/CONTROL @@ -1,4 +1,5 @@ Source: live555 -Version: latest +Version: latest-1 Homepage: https://www.live555.com/liveMedia Description: A complete RTSP server application +Build-Depends: openssl diff --git a/ports/live555/fix-RTSPClient.patch b/ports/live555/fix-RTSPClient.patch new file mode 100644 index 000000000..66863963d --- /dev/null +++ b/ports/live555/fix-RTSPClient.patch @@ -0,0 +1,13 @@ +diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp +index 02c46c7..6127698 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); + } 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 c89d4e0a1..d4a5c0600 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) if(NOT VCPKG_USE_HEAD_VERSION) @@ -7,8 +5,6 @@ if(NOT VCPKG_USE_HEAD_VERSION) message(FATAL_ERROR "Live555 does not have persistent releases. Please re-run the installation with --head.") endif() -include(vcpkg_common_functions) - set(LIVE_VERSION latest) vcpkg_download_distfile(ARCHIVE @@ -20,6 +16,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + fix-RTSPClient.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -39,6 +37,6 @@ file(GLOB HEADERS ) file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() |