mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-22 08:33:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[live555] Fix live555:x86-windows-static build failure (#9303)

Browse Source
This commit is contained in:
Alvin 2019-12-21 04:00:56 +08:00 committed by dan-shaw
parent 14b0cf90e8
commit c77c1cd861
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/live555/CMakeLists.txt
View File

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

3
ports/live555/CONTROL
View File

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

13
ports/live555/fix-RTSPClient.patch Normal file
View File

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

8
ports/live555/portfile.cmake
View File

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