[libdatachannel] update to 0.16.0 (microsoft#22048)

* update libdatachannel to 0.16.0 * update libdatachannel to 0.16.0 * delete port-version * update version Co-authored-by: Jonliu1993 <[email protected]>
Hoikas · Dec 22, 2021 · 4c820a2 · 4c820a2
1 parent 51fd3a8
commit 4c820a2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch
@@ -1,16 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 02b688c..03b185f 100644
+index c0e59d1..1d71e38 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -27,7 +27,6 @@ endif()
+@@ -28,7 +28,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)
  	add_definitions(-DWIN32_LEAN_AND_MEAN)
-@@ -196,9 +195,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+@@ -197,12 +196,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
  find_package(Threads REQUIRED)
 
@@ -19,22 +19,25 @@ index 02b688c..03b185f 100644
 +find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
 +find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
 
+ if(SCTP_DEBUG)
+ 	add_definitions(-DSCTP_DEBUG)
+ endif()
 +if(0)
  option(sctp_build_programs 0)
  option(sctp_build_shared_lib 0)
  set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-@@ -210,8 +210,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+@@ -214,8 +214,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
      target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
  endif()
  add_library(Usrsctp::Usrsctp ALIAS usrsctp)
--
--add_library(datachannel SHARED
 +endif()
+
+-add_library(datachannel SHARED
 +add_library(datachannel
  	${LIBDATACHANNEL_SOURCES}
  	${LIBDATACHANNEL_HEADERS}
  	${LIBDATACHANNEL_IMPL_SOURCES}
-@@ -235,16 +235,18 @@ target_include_directories(datachannel PUBLIC
+@@ -239,16 +240,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)
@@ -55,7 +58,7 @@ index 02b688c..03b185f 100644
 
  if(WIN32)
  	target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
-@@ -339,11 +341,11 @@ else()
+@@ -351,11 +354,11 @@ else()
  		target_link_libraries(datachannel PRIVATE LibJuice::LibJuice)
  		target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice)
  	else()

diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO paullouisageneau/libdatachannel
-    REF 267fdc190bcd276aacf45e4cd5ab8a51541161e8 #v0.15.1
-    SHA512 333b1308b9f620326aa3b1af30aed8be2011c3a5a7d850e94476b8a14f696cef4cc815fda57e7a205cc264a077b7d1fa403ff1354364aae58651cdb0324c951b
+    REF 6e1222c4def8b959eedc8b9e6da95072afe6ff78 #v0.16.0
+    SHA512 bfa21b1f55a18c6bd0473b2c80d6739e9f06d463246004f91b216423739c5fa04651a099ef995b4ab12f392784208cc0c7ab8662e3790ce4be6be36e37a944d7
     HEAD_REF master
     PATCHES
         0001-fix-for-vcpkg.patch

diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libdatachannel",
-  "version-semver": "0.15.1",
-  "port-version": 1,
+  "version-semver": "0.16.0",
   "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": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3393,8 +3393,8 @@
       "port-version": 1
     },
     "libdatachannel": {
-      "baseline": "0.15.1",
-      "port-version": 1
+      "baseline": "0.16.0",
+      "port-version": 0
     },
     "libdatrie": {
       "baseline": "0.2.10",

diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d688c15b940166a1d8ecf701cafb7a060a7abd48",
+      "version-semver": "0.16.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4ef71c270b3ea4205b878248ade5e50c03fd54b4",
       "version-semver": "0.15.1",