Skip to content

Update libjuice to 0.7.1 to update libdatachannel #17076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 5 commits into from
Apr 7, 2021
Merged

Update libjuice to 0.7.1 to update libdatachannel #17076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c51428
Update libjuice to 0.7.1 to update libdatachannel
GameDumper Apr 4, 2021
1bf0702
Transform the CONTROL file to .json and update version baseline.
GameDumper Apr 4, 2021
16d7a45
Update libjuice version. I don't really know why it changed.
GameDumper Apr 4, 2021
73cf023
Fix version type
GameDumper Apr 7, 2021
6650665
Fix version type
GameDumper Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ports/libjuice/CONTROL
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions ports/libjuice/fix-for-vcpkg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8136e2e..fa7ce92 100644
index 6142f91..cfdfa40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,9 @@ set(LIBJUICE_SOURCES
@@ -53,6 +53,9 @@ set(LIBJUICE_SOURCES
set(LIBJUICE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h
)
Expand All @@ -12,7 +12,7 @@ index 8136e2e..fa7ce92 100644

set(TESTS_SOURCES
${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)
find_package(Threads REQUIRED)

Expand All @@ -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}/src)
target_link_libraries(juice PUBLIC Threads::Threads)
@@ -86,10 +89,14 @@ endif()
@@ -97,10 +100,14 @@ endif()

if (USE_NETTLE)
find_package(Nettle REQUIRED)
Expand All @@ -42,7 +42,7 @@ index 8136e2e..fa7ce92 100644
else()
target_compile_definitions(juice 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::LibJuiceStatic ALIAS juice-static)

Expand All @@ -57,7 +57,7 @@ index 8136e2e..fa7ce92 100644

if(NOT MSVC)
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)
endif()

Expand Down
4 changes: 2 additions & 2 deletions ports/libjuice/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO paullouisageneau/libjuice
REF v0.6.0
SHA512 43ab1f4d7d51c05b5cf2c948c9910b26b5cb7f0f15f10cdfcfdbfc833cfc0caf23da18f12adc1aa7183f77cfb510f5637031d89b3b08014c1fb7266b7f5f31f2
REF v0.7.1
SHA512 4a8a8705d8ee5f6d242e4463e13fbd45ec86145bf17f9c4f755e60922166b3cb12773296fac34f02cbe4ac79f91d73f2bc6406445cfe9520bf09e10d1606bc7e
HEAD_REF master
PATCHES
fix-for-vcpkg.patch
Expand Down
14 changes: 14 additions & 0 deletions ports/libjuice/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3169,7 +3169,7 @@
"port-version": 0
},
"libjuice": {
"baseline": "0.6.0",
"baseline": "0.7.1",
"port-version": 0
},
"libkeyfinder": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libjuice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "42cecee2b8da92c2c8c120c09bd663b20f2c947a",
"version": "0.7.1",
"port-version": 0
},
{
"git-tree": "e7ef5f1f7d883e5f8a7dcb52ea5821730281e375",
"version-string": "0.6.0",
Expand Down