[libdatachannel][libjuice] Update libdatachannel to 0.14.1 and libjuice to 0.8.4. (#19305)

* Update libjuice and libdatachannel

* Update libjuice

* Update baseline

* Update libdatachannel to 0.14.1

Fixes *-uwp.

* Update baseline.

* Fix nettle discovery

* Fix usrsctp library path.

* Fix libdatachannel not being built SHARED.

* Update baseline.

Co-authored-by: Nemirtingas <nanaki89@hotmail.fr>

3 files changed, 13 insertions, 48 deletions

diff --git a/ports/libjuice/fix-for-vcpkg.patch b/ports/libjuice/fix-for-vcpkg.patch
index 72ef83d0b..75ab492a0 100644
--- a/ports/libjuice/fix-for-vcpkg.patch
+++ b/ports/libjuice/fix-for-vcpkg.patch
@@ -1,68 +1,33 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6142f91..cfdfa40 100644
+index aedb557..89c701b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -53,6 +53,9 @@ set(LIBJUICE_SOURCES
- set(LIBJUICE_HEADERS
- 	${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h
- )
-+set(LIBJUICE_PRIVATE_HEADERS
-+   ${CMAKE_CURRENT_SOURCE_DIR}/src/socket.h
-+)
- 
- set(TESTS_SOURCES
-     ${CMAKE_CURRENT_SOURCE_DIR}/test/main.c
-@@ -70,10 +73,10 @@ set(TESTS_SOURCES
+@@ -72,7 +72,7 @@ set(TESTS_SOURCES
  set(THREADS_PREFER_PTHREAD_FLAG ON)
  find_package(Threads REQUIRED)
  
 -add_library(juice SHARED ${LIBJUICE_SOURCES})
 +add_library(juice ${LIBJUICE_SOURCES})
  set_target_properties(juice PROPERTIES VERSION ${PROJECT_VERSION})
+ target_compile_definitions(juice PRIVATE $<$<CONFIG:Release>:RELEASE=1>)
  
--target_include_directories(juice PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-+target_include_directories(juice PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
- target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/juice)
- target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
- target_link_libraries(juice PUBLIC Threads::Threads)
-@@ -97,10 +100,14 @@ endif()
+@@ -100,11 +100,15 @@ if(WIN32)
+ endif()
  
  if (USE_NETTLE)
- 	find_package(Nettle REQUIRED)
+-	find_package(Nettle REQUIRED)
 +    find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED)
++    find_library(NETTLE_LIBRARY_PATH NAMES nettle libnettle REQUIRED) 
 +    target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH})
 +    target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH})
 +
      target_compile_definitions(juice PRIVATE USE_NETTLE=1)
 -    target_link_libraries(juice PRIVATE Nettle::Nettle)
-+    target_link_libraries(juice PRIVATE nettle)
++    target_link_libraries(juice PRIVATE ${NETTLE_LIBRARY_PATH})
      target_compile_definitions(juice-static PRIVATE USE_NETTLE=1)
 -    target_link_libraries(juice-static PRIVATE Nettle::Nettle)
-+    target_link_libraries(juice-static PRIVATE nettle)
++    target_link_libraries(juice-static PRIVATE ${NETTLE_LIBRARY_PATH})
  else()
      target_compile_definitions(juice PRIVATE USE_NETTLE=0)
      target_compile_definitions(juice-static PRIVATE USE_NETTLE=0)
-@@ -125,8 +132,13 @@ endif()
- add_library(LibJuice::LibJuice ALIAS juice)
- add_library(LibJuice::LibJuiceStatic ALIAS juice-static)
- 
--install(TARGETS juice LIBRARY DESTINATION lib)
-+install(TARGETS juice EXPORT libjuice-config
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+)
- install(FILES ${LIBJUICE_HEADERS} DESTINATION include/juice)
-+install(FILES ${LIBJUICE_PRIVATE_HEADERS} DESTINATION include/juice/src)
- 
- if(NOT MSVC)
- 	target_compile_options(juice PRIVATE -Wall -Wextra)
-@@ -161,3 +173,8 @@ if(NOT NO_TESTS)
- 	target_link_libraries(juice-tests juice)
- endif()
- 
-+install(
-+  EXPORT libjuice-config
-+  NAMESPACE LibJuice::
-+  DESTINATION share/cmake/libjuice
-+)
+
diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake
index 16c83d189..bbe0d1db2 100644
--- a/ports/libjuice/portfile.cmake
+++ b/ports/libjuice/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO paullouisageneau/libjuice

-    REF v0.7.1

-    SHA512 4a8a8705d8ee5f6d242e4463e13fbd45ec86145bf17f9c4f755e60922166b3cb12773296fac34f02cbe4ac79f91d73f2bc6406445cfe9520bf09e10d1606bc7e

+    REF v0.8.4

+    SHA512 c33fc237ff0acb6b9cb37143d1f5a22f20670c8e32200d79c45c8473e1b0e1174926706876a1c37a51ba9ec6ec935337fd87512211eaaf8652f73d4934038834

     HEAD_REF master

     PATCHES

         fix-for-vcpkg.patch

diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json
index 7aa06acb5..6ba94b4cc 100644
--- a/ports/libjuice/vcpkg.json
+++ b/ports/libjuice/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libjuice",
-  "version": "0.7.1",
+  "version": "0.8.4",
   "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libjuice",
   "features": {