From 526d0625e17435d2df2258b4ded2c5060c60caed Mon Sep 17 00:00:00 2001 From: Cal McLean Date: Fri, 3 Sep 2021 02:03:41 +0100 Subject: [libdatachannel] Update to v0.14.3 (#19826) * [libdatachannel] update to version 0.14.3, fixing linking errors * [libdatachannel] correctly format manifest * [libdatachannel]: x-add-version --all --- ports/libdatachannel/0001-fix-for-vcpkg.patch | 75 +++++++++++++++++++++++++++ ports/libdatachannel/fix-for-vcpkg.patch | 71 ------------------------- ports/libdatachannel/portfile.cmake | 6 +-- ports/libdatachannel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 ++ 6 files changed, 85 insertions(+), 76 deletions(-) create mode 100644 ports/libdatachannel/0001-fix-for-vcpkg.patch delete mode 100644 ports/libdatachannel/fix-for-vcpkg.patch diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch new file mode 100644 index 000000000..528f47a88 --- /dev/null +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f0559b1..3c01184 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,7 +27,6 @@ endif() + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) +-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static + + if(WIN32) + add_definitions(-DWIN32_LEAN_AND_MEAN) +@@ -197,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) + +-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) +-add_subdirectory(deps/plog EXCLUDE_FROM_ALL) ++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=) +-endif() +-if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") +- target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) +-endif() +-add_library(Usrsctp::Usrsctp ALIAS usrsctp) +- +-add_library(datachannel SHARED ++add_library(datachannel + ${LIBDATACHANNEL_SOURCES} + ${LIBDATACHANNEL_HEADERS} + ${LIBDATACHANNEL_IMPL_SOURCES} +@@ -233,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES + target_include_directories(datachannel PUBLIC $) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel PUBLIC Threads::Threads) +-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) + + target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel-static PUBLIC Threads::Threads) +-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) + + if(WIN32) + target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 +@@ -335,11 +324,11 @@ else() + target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) + target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) + else() +- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) ++ find_package(libjuice CONFIG REQUIRED) + target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) + target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) +- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) +- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) ++ target_link_libraries(datachannel PRIVATE LibJuice::juice) ++ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) + endif() + endif() + +-- +2.33.0.windows.1 + diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/fix-for-vcpkg.patch deleted file mode 100644 index 075b7baf2..000000000 --- a/ports/libdatachannel/fix-for-vcpkg.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index beb5000..d6c26cf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,5 +30,4 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) --set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static - - if(WIN32) -@@ -196,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads REQUIRED) - --set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) --add_subdirectory(deps/plog EXCLUDE_FROM_ALL) -- --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=) --endif() --if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") -- 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") - --add_library(datachannel SHARED -+add_library(datachannel - ${LIBDATACHANNEL_SOURCES} - ${LIBDATACHANNEL_HEADERS} - ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -232,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES - target_include_directories(datachannel PUBLIC $) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel PUBLIC Threads::Threads) --target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) -+target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) - - target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel-static PUBLIC Threads::Threads) --target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) -+target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) - - if(WIN32) - target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -334,11 +324,11 @@ else() - target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) - target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) - else() -- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) -+ find_package(libjuice CONFIG REQUIRED) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) - target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) -- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) -- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) -+ target_link_libraries(datachannel PRIVATE LibJuice::juice) -+ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) - endif() - endif() - - diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 902220a90..0f8b15881 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF v0.14.1 - SHA512 a0eb834eacdb5aef644fc4456b5087742aab37ac58e2871daa7ba2ac25cab4ddb530bd0a12cf5f4754c28749a2f59fc2fb3e2ae945b867cec8aaad22f4ac71c6 + REF v0.14.3 + SHA512 21746d1a02aa8eb98a5c9716c12f14048a680f85efab8d8beca02379946bb49858c7ed02e7238f61e94d0aba6d70069136778d78484b88f8d09640c0740e24a3 HEAD_REF master PATCHES - fix-for-vcpkg.patch + 0001-fix-for-vcpkg.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index d657a3841..cccbf06e1 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.14.1", + "version-semver": "0.14.3", "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": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4b7e94024..4f12977ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3161,7 +3161,7 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.14.1", + "baseline": "0.14.3", "port-version": 0 }, "libdatrie": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 7592d1161..2b7b41a6f 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cb7fedbd9d94190697740000539fb124d2b57d4", + "version-semver": "0.14.3", + "port-version": 0 + }, { "git-tree": "a58c126e0f1be88bc997210e63fe2e07cf64d1e5", "version-semver": "0.14.1", -- cgit v1.2.3