[libdatachannel] Update to 0.15.1 (#20317)

* [libdatachannel] Update to 0.15.1

* Revert to version-semver

6 files changed, 34 insertions, 100 deletions

diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch
index 528f47a88..1d859d814 100644
--- a/ports/libdatachannel/0001-fix-for-vcpkg.patch
+++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0559b1..3c01184 100644
+index 02b688c..03b185f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -27,7 +27,6 @@ endif()
@@ -10,7 +10,7 @@ index f0559b1..3c01184 100644
  
  if(WIN32)
  	add_definitions(-DWIN32_LEAN_AND_MEAN)
-@@ -197,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+@@ -196,9 +195,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
  find_package(Threads REQUIRED)
  
@@ -19,43 +19,43 @@ index f0559b1..3c01184 100644
 +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)
--add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
--if (MSYS OR MINGW)
--	target_compile_definitions(usrsctp PUBLIC -DSCTP_STDINT_INCLUDE=<stdint.h>)
--endif()
--if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
--    target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
--endif()
--add_library(Usrsctp::Usrsctp ALIAS usrsctp)
++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")
+     target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
+ endif()
+ add_library(Usrsctp::Usrsctp ALIAS usrsctp)
 -
 -add_library(datachannel SHARED
++endif()
 +add_library(datachannel
  	${LIBDATACHANNEL_SOURCES}
  	${LIBDATACHANNEL_HEADERS}
  	${LIBDATACHANNEL_IMPL_SOURCES}
-@@ -233,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES
- target_include_directories(datachannel PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+@@ -235,16 +235,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)
 +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
- target_link_libraries(datachannel PUBLIC Threads::Threads)
+ target_link_libraries(datachannel PRIVATE Threads::Threads)
 -target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog)
 +target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY})
  
- target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+ target_include_directories(datachannel-static PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+     $<INSTALL_INTERFACE:include>)
  target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
  target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
- target_link_libraries(datachannel-static PUBLIC Threads::Threads)
+ target_link_libraries(datachannel-static PRIVATE Threads::Threads)
 -target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog)
 +target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY})
  
  if(WIN32)
  	target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
-@@ -335,11 +324,11 @@ else()
+@@ -339,11 +341,11 @@ else()
  		target_link_libraries(datachannel PRIVATE LibJuice::LibJuice)
  		target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice)
  	else()
@@ -70,6 +70,3 @@ index f0559b1..3c01184 100644
  	endif()
  endif()
  
--- 
-2.33.0.windows.1
-
diff --git a/ports/libdatachannel/0002-fix-export-include.patch b/ports/libdatachannel/0002-fix-export-include.patch
deleted file mode 100644
index 980f242b9..000000000
--- a/ports/libdatachannel/0002-fix-export-include.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c01184..0adff6f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -217,18 +217,22 @@ set_target_properties(datachannel-static PROPERTIES
- 	VERSION ${PROJECT_VERSION}
- 	CXX_STANDARD 17)
- 
--target_include_directories(datachannel PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
-+target_include_directories(datachannel PUBLIC
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-+    $<INSTALL_INTERFACE:include>)
- target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
- target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
- target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
--target_link_libraries(datachannel PUBLIC Threads::Threads)
-+target_link_libraries(datachannel PRIVATE Threads::Threads)
- target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY})
- 
--target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-+target_include_directories(datachannel-static PUBLIC 
-+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-+    $<INSTALL_INTERFACE:include>)
- target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc)
- target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
- target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS})
--target_link_libraries(datachannel-static PUBLIC Threads::Threads)
-+target_link_libraries(datachannel-static PRIVATE Threads::Threads)
- target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY})
- 
- if(WIN32)
-diff --git a/examples/client-benchmark/CMakeLists.txt b/examples/client-benchmark/CMakeLists.txt
-index ad0024c..a734db6 100644
---- a/examples/client-benchmark/CMakeLists.txt
-+++ b/examples/client-benchmark/CMakeLists.txt
-@@ -3,6 +3,7 @@ if(POLICY CMP0079)
- 	cmake_policy(SET CMP0079 NEW)
- endif()
- 
-+find_package(Threads)
- if(WIN32)
- 	add_executable(datachannel-client-benchmark main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h)
- 	target_compile_definitions(datachannel-client-benchmark PUBLIC STATIC_GETOPT)
-@@ -15,7 +16,7 @@ set_target_properties(datachannel-client-benchmark PROPERTIES
- 	OUTPUT_NAME client-benchmark)
- set_target_properties(datachannel-client-benchmark PROPERTIES
- 	XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.github.paullouisageneau.libdatachannel.examples.client.benchmark)
--target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json)
-+target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json Threads::Threads)
- 
- if(WIN32)
- 	add_custom_command(TARGET datachannel-client-benchmark POST_BUILD
-diff --git a/examples/streamer/CMakeLists.txt b/examples/streamer/CMakeLists.txt
-index cebec95..3e73160 100644
---- a/examples/streamer/CMakeLists.txt
-+++ b/examples/streamer/CMakeLists.txt
-@@ -47,7 +47,8 @@ set_target_properties(streamer PROPERTIES
- set_target_properties(streamer PROPERTIES
- 	XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.github.paullouisageneau.libdatachannel.examples.streamer)
- 
--target_link_libraries(streamer datachannel nlohmann_json)
-+find_package(Threads)
-+target_link_libraries(streamer datachannel nlohmann_json Threads::Threads)
- 
- if(WIN32)
- 	add_custom_command(TARGET streamer POST_BUILD
diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
index 96033b723..c61587942 100644
--- a/ports/libdatachannel/portfile.cmake
+++ b/ports/libdatachannel/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO paullouisageneau/libdatachannel

-    REF v0.14.3

-    SHA512 21746d1a02aa8eb98a5c9716c12f14048a680f85efab8d8beca02379946bb49858c7ed02e7238f61e94d0aba6d70069136778d78484b88f8d09640c0740e24a3

+    REF 267fdc190bcd276aacf45e4cd5ab8a51541161e8 #v0.15.1

+    SHA512 333b1308b9f620326aa3b1af30aed8be2011c3a5a7d850e94476b8a14f696cef4cc815fda57e7a205cc264a077b7d1fa403ff1354364aae58651cdb0324c951b

     HEAD_REF master

     PATCHES

         0001-fix-for-vcpkg.patch

-        0002-fix-export-include.patch # Remove this patch in the next update

 )

 

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

@@ -18,7 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )

 

 vcpkg_cmake_configure(

-    SOURCE_PATH ${SOURCE_PATH}

+    SOURCE_PATH "${SOURCE_PATH}"

     OPTIONS

         ${FEATURE_OPTIONS}

         -DUSE_SYSTEM_SRTP=ON

@@ -28,11 +27,11 @@ vcpkg_cmake_configure(
 

 vcpkg_cmake_install()

 

-vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libdatachannel)

+vcpkg_cmake_config_fixup(PACKAGE_NAME LibDataChannel CONFIG_PATH lib/cmake/LibDataChannel)

 vcpkg_fixup_pkgconfig()

 

-file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake" DATACHANNEL_CONFIG)

-file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake" "

+file(READ "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cmake" DATACHANNEL_CONFIG)

+file(WRITE "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cmake" "

 include(CMakeFindDependencyMacro)

 find_dependency(Threads)

 find_dependency(OpenSSL)

@@ -41,4 +40,4 @@ ${DATACHANNEL_CONFIG}")
 

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

 

-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)
\ No newline at end of file
diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
index 4c34b7618..cffe9b8a2 100644
--- a/ports/libdatachannel/vcpkg.json
+++ b/ports/libdatachannel/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libdatachannel",
-  "version-semver": "0.14.3",
-  "port-version": 1,
+  "version-semver": "0.15.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",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 0b146f022..719b5257f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3281,8 +3281,8 @@
       "port-version": 1
     },
     "libdatachannel": {
-      "baseline": "0.14.3",
-      "port-version": 1
+      "baseline": "0.15.1",
+      "port-version": 0
     },
     "libdatrie": {
       "baseline": "0.2.10",
diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json
index b351d9f3b..cb6963b98 100644
--- a/versions/l-/libdatachannel.json
+++ b/versions/l-/libdatachannel.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "eb99868eb60c37127a98ff943da771edb8002a29",
+      "version-semver": "0.15.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "4e6c861ece23dfcb6f777b4a63dd97592cd578db",
       "version-semver": "0.14.3",
       "port-version": 1