mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 00:28:00 +08:00
[libsrt] Update to 1.4.4 (#20641)
* Update libsrt to 1.4.4 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
parent
c577ab81d7
commit
469b6e7d8d
@ -1,36 +1,7 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ec91d08..f19d28d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -234,6 +234,10 @@ if (ENABLE_ENCRYPTION)
|
||||
# fall back to find_package method otherwise
|
||||
if (USE_OPENSSL_PC)
|
||||
pkg_check_modules(SSL ${SSL_REQUIRED_MODULES})
|
||||
+ else()
|
||||
+ find_package(OpenSSL REQUIRED)
|
||||
+ set(SSL_FOUND ${OpenSSL_FOUND})
|
||||
+ set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
|
||||
endif()
|
||||
if (SSL_FOUND)
|
||||
# We have some cases when pkg-config is improperly configured
|
||||
@@ -438,7 +442,7 @@ elseif (WIN32 AND NOT MINGW)
|
||||
message(FATAL_ERROR "Failed to find pthread.h. Specify PTHREAD_INCLUDE_DIR.")
|
||||
endif()
|
||||
|
||||
- find_library(PTHREAD_LIBRARY NAMES pthread pthread_dll pthread_lib HINTS C:/pthread-win32/lib C:/pthread-win64/lib)
|
||||
+ find_library(PTHREAD_LIBRARY NAMES pthreadVC3 REQUIRED)
|
||||
if (PTHREAD_LIBRARY)
|
||||
message(STATUS "Pthread library: ${PTHREAD_LIBRARY}")
|
||||
else()
|
||||
@@ -637,6 +641,7 @@ if (ENABLE_SHARED)
|
||||
target_compile_definitions(srt_virtual PUBLIC -DSRT_DYNAMIC)
|
||||
target_compile_definitions(haicrypt_virtual PRIVATE -DHAICRYPT_EXPORTS)
|
||||
endif()
|
||||
+target_link_libraries(haicrypt_virtual PRIVATE ${SSL_LIBRARIES})
|
||||
|
||||
if (srt_libspec_shared)
|
||||
if (MICROSOFT)
|
||||
@@ -650,6 +655,7 @@ set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_LIBDIR})
|
||||
@@ -1008,6 +1008,7 @@ set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_LIBDIR})
|
||||
if (CYGWIN)
|
||||
set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
@ -38,16 +9,16 @@ index ec91d08..f19d28d 100644
|
||||
|
||||
message(STATUS "INSTALL DIRS: bin=${CMAKE_INSTALL_BINDIR} lib=${CMAKE_INSTALL_LIBDIR} shlib=${INSTALL_SHARED_DIR} include=${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
|
||||
@@ -730,7 +736,7 @@ macro(srt_add_program name)
|
||||
add_executable(${name} ${ARGN})
|
||||
target_include_directories(${name} PRIVATE apps)
|
||||
target_include_directories(${name} PRIVATE common)
|
||||
@@ -1085,7 +1085,7 @@
|
||||
|
||||
macro(srt_add_program name)
|
||||
srt_add_program_dont_install(${name} ${ARGN})
|
||||
- install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+ install(TARGETS ${name} RUNTIME DESTINATION tools)
|
||||
endmacro()
|
||||
|
||||
macro(srt_make_application name)
|
||||
@@ -769,7 +775,7 @@ endmacro()
|
||||
@@ -1124,7 +1124,7 @@ endmacro()
|
||||
macro(srt_add_application name) # ARGN=sources...
|
||||
srt_add_program(${name} apps/${name}.cpp ${ARGN})
|
||||
srt_make_application(${name})
|
||||
@ -56,7 +27,7 @@ index ec91d08..f19d28d 100644
|
||||
endmacro()
|
||||
|
||||
## FIXME: transmitmedia.cpp does not build on OpenBSD
|
||||
@@ -923,7 +929,7 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11)
|
||||
@@ -1324,7 +1324,7 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11)
|
||||
endif()
|
||||
|
||||
|
||||
@ -65,10 +36,3 @@ index ec91d08..f19d28d 100644
|
||||
|
||||
|
||||
if (DEFINED SRT_EXTRA_APPS_INC)
|
||||
@@ -939,5 +945,5 @@ if ( ENABLE_SUFLIP )
|
||||
)
|
||||
srt_add_program(suflip ${SOURCES_suflip})
|
||||
target_link_libraries(suflip ${srt_link_library})
|
||||
- install(TARGETS suflip RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+ install(TARGETS suflip RUNTIME DESTINATION tools)
|
||||
endif ()
|
||||
|
@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Haivision/srt
|
||||
REF v1.3.4
|
||||
SHA512 3a9f9a8fd8ba56ae9ca04203bdea9e9a25275e1f531ca10deee0e760e6beaf44e83ee7a616cfe3ade9676082d9cc8611214de876f64d141e1e8c3b1e16273001
|
||||
REF v1.4.4
|
||||
SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA
|
||||
HEAD_REF master
|
||||
PATCHES fix-dependency-install.patch
|
||||
)
|
||||
@ -17,25 +17,24 @@ else()
|
||||
set(BUILD_STATIC ON)
|
||||
endif()
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
tool ENABLE_APPS
|
||||
vcpkg_check_features(
|
||||
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
tool ENABLE_APPS
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
-DENABLE_SHARED=${BUILD_DYNAMIC}
|
||||
-DENABLE_STATIC=${BUILD_STATIC}
|
||||
-DINSTALL_DOCS=ON
|
||||
-DINSTALL_PKG_CONFIG_MODULE=ON
|
||||
-DENABLE_SUFLIP=OFF # Since there are some file not found, disable this feature
|
||||
-DENABLE_UNITTESTS=OFF
|
||||
-DUSE_OPENSSL_PC=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
@ -1,14 +1,14 @@
|
||||
{
|
||||
"name": "libsrt",
|
||||
"version-string": "1.3.4",
|
||||
"port-version": 1,
|
||||
"version": "1.4.4",
|
||||
"description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.",
|
||||
"homepage": "https://github.com/Haivision/srt",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"openssl",
|
||||
{
|
||||
"name": "pthreads",
|
||||
"platform": "windows"
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"features": {
|
||||
|
@ -3821,8 +3821,8 @@
|
||||
"port-version": 9
|
||||
},
|
||||
"libsrt": {
|
||||
"baseline": "1.3.4",
|
||||
"port-version": 1
|
||||
"baseline": "1.4.4",
|
||||
"port-version": 0
|
||||
},
|
||||
"libsrtp": {
|
||||
"baseline": "2.4.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8187d1dc57e7d3632bdabee7516a94e0ab2a0afb",
|
||||
"version": "1.4.4",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "9e446dfb7ecd2ec36c5b960c00bbc8ac9da43673",
|
||||
"version-string": "1.3.4",
|
||||
|
Loading…
x
Reference in New Issue
Block a user