diff options
| author | Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> | 2020-11-18 23:15:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 14:15:31 -0800 |
| commit | e93bc55f0dba94ee9f7d0e30d2f4450000ae90be (patch) | |
| tree | 2218b1ad0281887d25a731966366f8883a2fdc66 | |
| parent | 34e79cb04345f2db8003712bf65862a97396405e (diff) | |
| download | vcpkg-e93bc55f0dba94ee9f7d0e30d2f4450000ae90be.tar.gz vcpkg-e93bc55f0dba94ee9f7d0e30d2f4450000ae90be.zip | |
[libjuice] Update libjuice for libdatachannel port. (#14213)
* Update libjuice for libdatachannel port.
* Update ports/libjuice/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update libjuice to v0.6.0
* Update ports/libjuice/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Nemirtingas <nanaki89@hotmail.fr>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/libjuice/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libjuice/fix-for-vcpkg.patch | 18 | ||||
| -rw-r--r-- | ports/libjuice/portfile.cmake | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ports/libjuice/CONTROL b/ports/libjuice/CONTROL index 5901d8d74..4660f8033 100644 --- a/ports/libjuice/CONTROL +++ b/ports/libjuice/CONTROL @@ -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.
diff --git a/ports/libjuice/fix-for-vcpkg.patch b/ports/libjuice/fix-for-vcpkg.patch index 6bbfd837f..2d390aa9f 100644 --- a/ports/libjuice/fix-for-vcpkg.patch +++ b/ports/libjuice/fix-for-vcpkg.patch @@ -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 ) @@ -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) @@ -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) @@ -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) @@ -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() diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index 68770243f..c03818b2b 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 92fc9e7a9d8cd19a5c5d59cbc0a11cc9f684483b
- SHA512 80e9898c51bc98a60ca317030bc5394fda412c2bc822adc656f88bfa60b42501d4945a8692771afb8241ec7994fbe48c3e8360f919a0859cfb47288fd3292dd4
+ REF v0.6.0
+ SHA512 43ab1f4d7d51c05b5cf2c948c9910b26b5cb7f0f15f10cdfcfdbfc833cfc0caf23da18f12adc1aa7183f77cfb510f5637031d89b3b08014c1fb7266b7f5f31f2
HEAD_REF master
PATCHES
fix-for-vcpkg.patch
|