[libdatachannel] Update to v0.14.3 (#19826)

* [libdatachannel] update to version 0.14.3, fixing linking errors

* [libdatachannel] correctly format manifest

* [libdatachannel]: x-add-version --all
This commit is contained in:
Cal McLean 2021-09-03 02:03:41 +01:00 committed by GitHub
parent 8db63fc115
commit 526d0625e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 14 deletions

View File

@ -1,20 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index beb5000..d6c26cf 100644
index f0559b1..3c01184 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,5 +30,4 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -27,7 +27,6 @@ endif()
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)
@@ -196,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
add_definitions(-DWIN32_LEAN_AND_MEAN)
@@ -197,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
-add_subdirectory(deps/plog EXCLUDE_FROM_ALL)
-
+find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
-option(sctp_build_programs 0)
-option(sctp_build_shared_lib 0)
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
@ -26,15 +30,13 @@ index beb5000..d6c26cf 100644
- target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
-endif()
-add_library(Usrsctp::Usrsctp ALIAS usrsctp)
+find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
-
-add_library(datachannel SHARED
+add_library(datachannel
${LIBDATACHANNEL_SOURCES}
${LIBDATACHANNEL_HEADERS}
${LIBDATACHANNEL_IMPL_SOURCES}
@@ -232,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES
@@ -233,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES
target_include_directories(datachannel PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
@ -53,7 +55,7 @@ index beb5000..d6c26cf 100644
if(WIN32)
target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
@@ -334,11 +324,11 @@ else()
@@ -335,11 +324,11 @@ else()
target_link_libraries(datachannel PRIVATE LibJuice::LibJuice)
target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice)
else()
@ -68,4 +70,6 @@ index beb5000..d6c26cf 100644
endif()
endif()
--
2.33.0.windows.1

View File

@ -1,11 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO paullouisageneau/libdatachannel
REF v0.14.1
SHA512 a0eb834eacdb5aef644fc4456b5087742aab37ac58e2871daa7ba2ac25cab4ddb530bd0a12cf5f4754c28749a2f59fc2fb3e2ae945b867cec8aaad22f4ac71c6
REF v0.14.3
SHA512 21746d1a02aa8eb98a5c9716c12f14048a680f85efab8d8beca02379946bb49858c7ed02e7238f61e94d0aba6d70069136778d78484b88f8d09640c0740e24a3
HEAD_REF master
PATCHES
fix-for-vcpkg.patch
0001-fix-for-vcpkg.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,6 +1,6 @@
{
"name": "libdatachannel",
"version-semver": "0.14.1",
"version-semver": "0.14.3",
"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",
"dependencies": [

View File

@ -3161,7 +3161,7 @@
"port-version": 0
},
"libdatachannel": {
"baseline": "0.14.1",
"baseline": "0.14.3",
"port-version": 0
},
"libdatrie": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9cb7fedbd9d94190697740000539fb124d2b57d4",
"version-semver": "0.14.3",
"port-version": 0
},
{
"git-tree": "a58c126e0f1be88bc997210e63fe2e07cf64d1e5",
"version-semver": "0.14.1",