Skip to content

[libjuice] Update libjuice for libdatachannel port. #14213

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
strega-nil merged 4 commits into from
Nov 18, 2020
Merged

[libjuice] Update libjuice for libdatachannel port. #14213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
661483a
Update libjuice for libdatachannel port.
GameDumper Oct 25, 2020
b148aaa
Update ports/libjuice/CONTROL
Nemirtingas Oct 26, 2020
40cddbc
Update libjuice to v0.6.0
GameDumper Nov 16, 2020
31b2780
Update ports/libjuice/CONTROL
Nemirtingas Nov 17, 2020
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
2 changes: 1 addition & 1 deletion ports/libjuice/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: libjuice
Version: 0.5.2
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.

Expand Down
18 changes: 9 additions & 9 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 be72a2a..8a631e8 100644
index 8136e2e..fa7ce92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,9 @@ set(LIBJUICE_SOURCES
@@ -46,6 +46,9 @@ set(LIBJUICE_SOURCES
set(LIBJUICE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h
)
Expand All @@ -12,7 +12,7 @@ index be72a2a..8a631e8 100644

set(TESTS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/test/main.c
@@ -54,10 +57,10 @@ set(TESTS_SOURCES
@@ -59,10 +62,10 @@ set(TESTS_SOURCES
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)

Expand All @@ -25,13 +25,13 @@ index be72a2a..8a631e8 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)
@@ -77,10 +80,14 @@ endif()
@@ -86,10 +89,14 @@ endif()

if (USE_NETTLE)
find_package(Nettle REQUIRED)
+ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED)
+ target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH})
+ target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH})
+ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" 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)
Expand All @@ -42,7 +42,7 @@ index be72a2a..8a631e8 100644
else()
target_compile_definitions(juice PRIVATE USE_NETTLE=0)
target_compile_definitions(juice-static PRIVATE USE_NETTLE=0)
@@ -100,8 +107,13 @@ endif()
@@ -109,8 +116,13 @@ endif()
add_library(LibJuice::LibJuice ALIAS juice)
add_library(LibJuice::LibJuiceStatic ALIAS juice-static)

Expand All @@ -57,7 +57,7 @@ index be72a2a..8a631e8 100644

if(NOT MSVC)
target_compile_options(juice PRIVATE -Wall -Wextra)
@@ -128,3 +140,8 @@ if(NOT NO_TESTS)
@@ -145,3 +157,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 92fc9e7a9d8cd19a5c5d59cbc0a11cc9f684483b
SHA512 80e9898c51bc98a60ca317030bc5394fda412c2bc822adc656f88bfa60b42501d4945a8692771afb8241ec7994fbe48c3e8360f919a0859cfb47288fd3292dd4
REF v0.6.0
SHA512 43ab1f4d7d51c05b5cf2c948c9910b26b5cb7f0f15f10cdfcfdbfc833cfc0caf23da18f12adc1aa7183f77cfb510f5637031d89b3b08014c1fb7266b7f5f31f2
HEAD_REF master
PATCHES
fix-for-vcpkg.patch
Expand Down