[libdatachannel] Update to 0.22.4 (microsoft#43338)

jimwang118 · Jan 21, 2025 · 90f00eb · 90f00eb
1 parent cbf0814
commit 90f00eb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 55 deletions.
diff --git a/ports/libdatachannel/dependencies.diff b/ports/libdatachannel/dependencies.diff
@@ -30,22 +30,12 @@ index 8a61757..b35e4b1 100644
  		if(NOT TARGET libSRTP::srtp2)
  			add_library(libSRTP::srtp2 UNKNOWN IMPORTED)
  			set_target_properties(libSRTP::srtp2 PROPERTIES
-@@ -475,8 +476,9 @@ install(
- )
-
- # Export config
-+configure_file(cmake/LibDataChannelConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/LibDataChannelConfig.cmake @ONLY)
- install(
--	FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibDataChannelConfig.cmake
-+	FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/LibDataChannelConfig.cmake
- 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LibDataChannel
- )
-
 diff --git a/cmake/LibDataChannelConfig.cmake b/cmake/LibDataChannelConfig.cmake
 index cb2b884..d0b77ca 100644
---- a/cmake/LibDataChannelConfig.cmake
-+++ b/cmake/LibDataChannelConfig.cmake
-@@ -1,2 +1,15 @@
+--- a/cmake/LibDataChannelConfig.cmake.in
++++ b/cmake/LibDataChannelConfig.cmake.in
+@@ -1,3 +1,16 @@
+ @PACKAGE_INIT@
 +if(NOT "@BUILD_SHARED_LIBS@")
 +    include(CMakeFindDependencyMacro)
 +    set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -59,5 +49,5 @@ index cb2b884..d0b77ca 100644
 +    find_dependency(LibJuice)
 +endif()
 +
- include("${CMAKE_CURRENT_LIST_DIR}/LibDataChannelTargets.cmake")
 
+ include("${CMAKE_CURRENT_LIST_DIR}/LibDataChannelTargets.cmake")
diff --git a/ports/libdatachannel/library-linkage.diff b/ports/libdatachannel/library-linkage.diff
diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
@@ -2,11 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO paullouisageneau/libdatachannel
     REF "v${VERSION}"
-    SHA512 fd0d66bb932e29abc01e9f1a8b16ccb79012a7e3901e2e0f882f56ab2f090260945e1556c85ad07ef897b8c70fcdd44cdeead9955a9bca7afe1dda8900c473cc
+    SHA512 738bfa45b804cab178426301f97674af4d04b253f45c3caa41b9ec8f658672662e9a7e37a61ee1523b724f3888df85ece86105ae3951aac65a0f2b17fc5b4fac
     HEAD_REF master
     PATCHES 
         dependencies.diff
-        library-linkage.diff
         uwp-warnings.patch
 )
 
@@ -20,7 +19,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE  # version.h configuration
     OPTIONS
         ${FEATURE_OPTIONS}
         -DPREFER_SYSTEM_LIB=ON
@@ -30,7 +28,6 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/LibDataChannel)
-vcpkg_fixup_pkgconfig()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rtc/common.hpp" "#ifdef RTC_STATIC" "#if 1")

diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libdatachannel",
-  "version-semver": "0.21.2",
-  "port-version": 2,
+  "version-semver": "0.22.4",
   "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": "MPL-2.0",

diff --git a/scripts/test_ports/vcpkg-ci-libdatachannel/portfile.cmake b/scripts/test_ports/vcpkg-ci-libdatachannel/portfile.cmake
@@ -3,8 +3,8 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO paullouisageneau/libdatachannel
-    REF v0.21.2
-    SHA512 fd0d66bb932e29abc01e9f1a8b16ccb79012a7e3901e2e0f882f56ab2f090260945e1556c85ad07ef897b8c70fcdd44cdeead9955a9bca7afe1dda8900c473cc
+    REF v0.22.4
+    SHA512 738bfa45b804cab178426301f97674af4d04b253f45c3caa41b9ec8f658672662e9a7e37a61ee1523b724f3888df85ece86105ae3951aac65a0f2b17fc5b4fac
     HEAD_REF master
     PATCHES 
         cmake-project.diff

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4421,8 +4421,8 @@
       "port-version": 0
     },
     "libdatachannel": {
-      "baseline": "0.21.2",
-      "port-version": 2
+      "baseline": "0.22.4",
+      "port-version": 0
     },
     "libdatrie": {
       "baseline": "0.2.13",

diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f861b170fcd424eba5db36a5b0b1aab753e09040",
+      "version-semver": "0.22.4",
+      "port-version": 0
+    },
     {
       "git-tree": "bdae5c743dedd26494c0c49587b1eef0bdffe042",
       "version-semver": "0.21.2",