Update libjuice to 0.7.1 to update libdatachannel (#17076)

* Update libjuice to 0.7.1 to update libdatachannel

* Transform the CONTROL file to .json and update version baseline.

* Update libjuice version. I don't really know why it changed.

* Fix version type

* Fix version type

Co-authored-by: Nemirtingas <nanaki89@hotmail.fr>
This commit is contained in:
Nemirtingas 2021-04-07 21:44:37 +02:00 committed by GitHub
parent f0979f3671
commit 12eb540f89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 17 deletions

View File

@ -1,8 +0,0 @@
Source: libjuice
Version: 0.6.0
Homepage: https://github.com/paullouisageneau/libjuice
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.
Feature: nettle
Build-Depends: nettle
Description: Use nettle for HMAC computation instead of the Builtin

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8136e2e..fa7ce92 100644 index 6142f91..cfdfa40 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -46,6 +46,9 @@ set(LIBJUICE_SOURCES @@ -53,6 +53,9 @@ set(LIBJUICE_SOURCES
set(LIBJUICE_HEADERS set(LIBJUICE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h ${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h
) )
@ -12,7 +12,7 @@ index 8136e2e..fa7ce92 100644
set(TESTS_SOURCES set(TESTS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/main.c ${CMAKE_CURRENT_SOURCE_DIR}/test/main.c
@@ -59,10 +62,10 @@ set(TESTS_SOURCES @@ -70,10 +73,10 @@ set(TESTS_SOURCES
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@ -25,7 +25,7 @@ index 8136e2e..fa7ce92 100644
target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/juice) target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/juice)
target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(juice PUBLIC Threads::Threads) target_link_libraries(juice PUBLIC Threads::Threads)
@@ -86,10 +89,14 @@ endif() @@ -97,10 +100,14 @@ endif()
if (USE_NETTLE) if (USE_NETTLE)
find_package(Nettle REQUIRED) find_package(Nettle REQUIRED)
@ -42,7 +42,7 @@ index 8136e2e..fa7ce92 100644
else() else()
target_compile_definitions(juice PRIVATE USE_NETTLE=0) target_compile_definitions(juice PRIVATE USE_NETTLE=0)
target_compile_definitions(juice-static PRIVATE USE_NETTLE=0) target_compile_definitions(juice-static PRIVATE USE_NETTLE=0)
@@ -109,8 +116,13 @@ endif() @@ -125,8 +132,13 @@ endif()
add_library(LibJuice::LibJuice ALIAS juice) add_library(LibJuice::LibJuice ALIAS juice)
add_library(LibJuice::LibJuiceStatic ALIAS juice-static) add_library(LibJuice::LibJuiceStatic ALIAS juice-static)
@ -57,7 +57,7 @@ index 8136e2e..fa7ce92 100644
if(NOT MSVC) if(NOT MSVC)
target_compile_options(juice PRIVATE -Wall -Wextra) target_compile_options(juice PRIVATE -Wall -Wextra)
@@ -145,3 +157,8 @@ if(NOT NO_TESTS) @@ -161,3 +173,8 @@ if(NOT NO_TESTS)
target_link_libraries(juice-tests juice) target_link_libraries(juice-tests juice)
endif() endif()

View File

@ -1,8 +1,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO paullouisageneau/libjuice REPO paullouisageneau/libjuice
REF v0.6.0 REF v0.7.1
SHA512 43ab1f4d7d51c05b5cf2c948c9910b26b5cb7f0f15f10cdfcfdbfc833cfc0caf23da18f12adc1aa7183f77cfb510f5637031d89b3b08014c1fb7266b7f5f31f2 SHA512 4a8a8705d8ee5f6d242e4463e13fbd45ec86145bf17f9c4f755e60922166b3cb12773296fac34f02cbe4ac79f91d73f2bc6406445cfe9520bf09e10d1606bc7e
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-for-vcpkg.patch fix-for-vcpkg.patch

14
ports/libjuice/vcpkg.json Normal file
View File

@ -0,0 +1,14 @@
{
"name": "libjuice",
"version": "0.7.1",
"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": {
"nettle": {
"description": "Use nettle for HMAC computation instead of the Builtin",
"dependencies": [
"nettle"
]
}
}
}

View File

@ -3169,7 +3169,7 @@
"port-version": 0 "port-version": 0
}, },
"libjuice": { "libjuice": {
"baseline": "0.6.0", "baseline": "0.7.1",
"port-version": 0 "port-version": 0
}, },
"libkeyfinder": { "libkeyfinder": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "42cecee2b8da92c2c8c120c09bd663b20f2c947a",
"version": "0.7.1",
"port-version": 0
},
{ {
"git-tree": "e7ef5f1f7d883e5f8a7dcb52ea5821730281e375", "git-tree": "e7ef5f1f7d883e5f8a7dcb52ea5821730281e375",
"version-string": "0.6.0", "version-string": "0.6.0",