[libdatachannel] update to 0.17.1 (#24294)

* [libdatachannel] update to 0.17.1

* update version

* Revert patch format

* update version

* disenble test

* update version

* add option

* update version
This commit is contained in:
JonLiu1993 2022-04-27 09:48:48 +08:00 committed by GitHub
parent 9f643818c1
commit 22e4b9e235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 25 deletions

View File

@ -1,16 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0e59d1..1d71e38 100644
index 8907872..31d8836 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static
if(WIN32)
add_definitions(-DWIN32_LEAN_AND_MEAN)
@@ -197,12 +196,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
@@ -201,12 +200,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
@ -26,7 +26,7 @@ index c0e59d1..1d71e38 100644
option(sctp_build_programs 0)
option(sctp_build_shared_lib 0)
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
@@ -214,8 +214,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -218,8 +218,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
endif()
add_library(Usrsctp::Usrsctp ALIAS usrsctp)
@ -37,7 +37,7 @@ index c0e59d1..1d71e38 100644
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_HEADERS}
${LIBDATACHANNEL_IMPL_SOURCES}
@@ -239,16 +240,18 @@ target_include_directories(datachannel PUBLIC
@@ -243,16 +244,18 @@ target_include_directories(datachannel PUBLIC
$<INSTALL_INTERFACE:include>)
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@ -58,18 +58,4 @@ index c0e59d1..1d71e38 100644
if(WIN32)
target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
@@ -351,11 +354,11 @@ else()
target_link_libraries(datachannel PRIVATE LibJuice::LibJuice)
target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice)
else()
- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL)
+ find_package(LibJuice CONFIG REQUIRED)
target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0)
target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0)
- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic)
- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic)
+ target_link_libraries(datachannel PRIVATE LibJuice::LibJuice)
+ target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice)
endif()
endif()

View File

@ -7,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO paullouisageneau/libdatachannel
REF 127f157fc00abeb6fe5a57ce56a7c4e092721203 #v0.16.4
SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454
REF d9a9a4dcfb7445ed4f305c9aba889a162a4bad30 #v0.17.1
SHA512 1b53f52e24ee4e01b2bd1d65c7d738e621f168b7718c1fe16e514c34e7bccc3d195c193a7363f31c6b651c7c6757260dce4b197111375800d2f6bdf0d5b06100
HEAD_REF master
PATCHES
${PATCHES}
@ -27,6 +27,7 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
-DUSE_SYSTEM_SRTP=ON
-DUSE_SYSTEM_JUICE=ON
-DNO_EXAMPLES=ON
-DNO_TESTS=ON
)

View File

@ -1,9 +1,9 @@
{
"name": "libdatachannel",
"version-semver": "0.16.4",
"port-version": 1,
"version-semver": "0.17.1",
"description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
"homepage": "https://github.com/paullouisageneau/libdatachannel",
"license": "LGPL-2.1-only",
"dependencies": [
"libjuice",
"openssl",

View File

@ -3481,8 +3481,8 @@
"port-version": 0
},
"libdatachannel": {
"baseline": "0.16.4",
"port-version": 1
"baseline": "0.17.1",
"port-version": 0
},
"libdatrie": {
"baseline": "0.2.13",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9692159a4275af713e1525a9c81447fdd614869a",
"version-semver": "0.17.1",
"port-version": 0
},
{
"git-tree": "61f3e1e569991d144cb32b0f21c2b1e3baab78a2",
"version-semver": "0.16.4",