aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNemirtingas <9432037+Nemirtingas@users.noreply.github.com>2021-04-09 19:01:14 +0200
committerGitHub <noreply@github.com>2021-04-09 10:01:14 -0700
commit9ec62173162f494e4d63c260afe3d699893e23de (patch)
tree3d1fe0ef39ef7d9bdafe4086d67f6760486900af
parent59b938ed9ae81700b25b1cb7e2f3e13cd981f700 (diff)
downloadvcpkg-9ec62173162f494e4d63c260afe3d699893e23de.tar.gz
vcpkg-9ec62173162f494e4d63c260afe3d699893e23de.zip
[libdatachannel ] Update to 0.12.0 (#17077)
* Update libdatachannel to 0.12.0 * Update version and vcpkg.json format * Use semver * Update version * Update ports/libdatachannel/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update version hash Co-authored-by: Nemirtingas <nanaki89@hotmail.fr> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
-rw-r--r--ports/libdatachannel/fix-for-vcpkg.patch56
-rw-r--r--ports/libdatachannel/portfile.cmake10
-rw-r--r--ports/libdatachannel/vcpkg.json5
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libdatachannel.json5
5 files changed, 40 insertions, 38 deletions
diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/fix-for-vcpkg.patch
index fc6c26adf..c86fef232 100644
--- a/ports/libdatachannel/fix-for-vcpkg.patch
+++ b/ports/libdatachannel/fix-for-vcpkg.patch
@@ -1,15 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bed634b..fced56e 100644
+index 14c1ecc..1a46b84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -112,28 +112,18 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+@@ -181,21 +181,10 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
-add_subdirectory(deps/plog)
--
++find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
++find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
+
-option(sctp_build_programs 0)
-option(sctp_build_shared_lib 0)
+-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL)
-if (MSYS OR MINGW)
- target_compile_definitions(usrsctp PUBLIC -DSCTP_STDINT_INCLUDE=<stdint.h>)
@@ -18,24 +21,13 @@ index bed634b..fced56e 100644
- target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation)
-endif()
-add_library(Usrsctp::Usrsctp ALIAS usrsctp)
-+find_library(USRSCTP_LIBRARY usrsctp REQUIRED)
-+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h")
-
- if (NO_WEBSOCKET)
-- add_library(datachannel SHARED
-+ add_library(datachannel
- ${LIBDATACHANNEL_SOURCES})
- add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
- ${LIBDATACHANNEL_SOURCES})
- target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0)
- target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0)
- else()
-- add_library(datachannel SHARED
-+ add_library(datachannel
- ${LIBDATACHANNEL_SOURCES}
- ${LIBDATACHANNEL_WEBSOCKET_SOURCES})
- add_library(datachannel-static STATIC EXCLUDE_FROM_ALL
-@@ -150,17 +140,17 @@ set_target_properties(datachannel-static PROPERTIES
+-
+-add_library(datachannel SHARED
++add_library(datachannel
+ ${LIBDATACHANNEL_SOURCES}
+ ${LIBDATACHANNEL_HEADERS}
+ ${LIBDATACHANNEL_IMPL_SOURCES}
+@@ -213,17 +202,17 @@ set_target_properties(datachannel-static PROPERTIES
VERSION ${PROJECT_VERSION}
CXX_STANDARD 17)
@@ -57,13 +49,13 @@ index bed634b..fced56e 100644
+target_link_libraries(datachannel-static PUBLIC Threads::Threads ${USRSCTP_LIBRARY})
if(WIN32)
- target_link_libraries(datachannel PRIVATE ws2_32) # winsock2
-@@ -224,11 +214,11 @@ if (USE_NICE OR NOT USE_JUICE)
+ target_link_libraries(datachannel PUBLIC ws2_32) # winsock2
+@@ -295,11 +284,11 @@ if (USE_NICE)
target_link_libraries(datachannel PRIVATE LibNice::LibNice)
target_link_libraries(datachannel-static PRIVATE LibNice::LibNice)
else()
- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL)
-+ find_package(libjuice CONFIG REQUIRED)
++ find_package(libjuice CONFIG REQUIRED)
target_compile_definitions(datachannel PRIVATE USE_NICE=0)
target_compile_definitions(datachannel-static PRIVATE USE_NICE=0)
- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic)
@@ -72,8 +64,8 @@ index bed634b..fced56e 100644
+ target_link_libraries(datachannel-static PRIVATE LibJuice::juice)
endif()
- if(RSA_KEY_BITS_2048)
-@@ -244,7 +234,11 @@ endif()
+ if(CAPI_STDCALL)
+@@ -310,7 +299,11 @@ endif()
add_library(LibDataChannel::LibDataChannel ALIAS datachannel)
add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static)
@@ -86,7 +78,7 @@ index bed634b..fced56e 100644
install(FILES ${LIBDATACHANNEL_HEADERS} DESTINATION include/rtc)
if(NOT MSVC)
-@@ -306,3 +300,8 @@ if(NOT NO_EXAMPLES AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+@@ -374,3 +367,8 @@ endif()
add_subdirectory(examples/copy-paste-capi)
endif()
@@ -95,10 +87,10 @@ index bed634b..fced56e 100644
+ NAMESPACE LibDatachannel::
+ DESTINATION share/cmake/libdatachannel
+)
-diff --git a/src/tcptransport.hpp b/src/tcptransport.hpp
-index 1447835..1c92686 100644
---- a/src/tcptransport.hpp
-+++ b/src/tcptransport.hpp
+diff --git a/src/impl/tcptransport.hpp b/src/impl/tcptransport.hpp
+index f091fa2..8bcfbe7 100644
+--- a/src/impl/tcptransport.hpp
++++ b/src/impl/tcptransport.hpp
@@ -29,7 +29,7 @@
#include <thread>
@@ -106,5 +98,5 @@ index 1447835..1c92686 100644
-#include "../deps/libjuice/src/socket.h"
+#include <juice/src/socket.h>
- namespace rtc {
+ namespace rtc::impl {
diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
index 9fb73f372..8b1a6c3a9 100644
--- a/ports/libdatachannel/portfile.cmake
+++ b/ports/libdatachannel/portfile.cmake
@@ -1,17 +1,19 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO paullouisageneau/libdatachannel
- REF v0.10.1
- SHA512 195f564776b2a7ab6fe3a838d55be7fa03b72a5f08faaba5ddefac59ae1fff28f3ee0b9ed5dc17a7ef9155a1d30a61f8c593f2a108f60e415ffd213188e081bd
+ REF v0.12.0
+ SHA512 878d0461255620c21597a6b7132ac0c9d1bcba19e32809cdd007039041eacc1f30a73b1c11c43b8b57a82ca1efeae2090822e6c5e13bd98f5afa086ec147e6e7
HEAD_REF master
PATCHES
fix-for-vcpkg.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ FEATURES
+ stdcall CAPI_STDCALL
INVERTED_FEATURES
- ws NO_WEBSOCKET
- srtp NO_MEDIA
+ ws NO_WEBSOCKET
+ srtp NO_MEDIA
)
vcpkg_configure_cmake(
diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
index 79299fa5c..6dddc4dc7 100644
--- a/ports/libdatachannel/vcpkg.json
+++ b/ports/libdatachannel/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "libdatachannel",
- "version-string": "v0.10.1",
+ "version-semver": "0.12.0",
"description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
"homepage": "https://github.com/paullouisageneau/libdatachannel",
"dependencies": [
@@ -19,6 +19,9 @@
"libsrtp"
]
},
+ "stdcall": {
+ "description": "Use stdcall convention in callbacks"
+ },
"ws": {
"description": "Web Socket support"
}
diff --git a/versions/baseline.json b/versions/baseline.json
index b3a52c9cb..8014b992a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2993,7 +2993,7 @@
"port-version": 0
},
"libdatachannel": {
- "baseline": "v0.10.1",
+ "baseline": "0.12.0",
"port-version": 0
},
"libdatrie": {
diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json
index 0db89af9b..b85861e67 100644
--- a/versions/l-/libdatachannel.json
+++ b/versions/l-/libdatachannel.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1c0a9c87c0695f1ecc03f342ba87d21ae152f7dd",
+ "version-semver": "0.12.0",
+ "port-version": 0
+ },
+ {
"git-tree": "a50b7fbf1ea5f38b6303e3491fac4de1c342337c",
"version-string": "v0.10.1",
"port-version": 0