diff --git forkSrcPrefix/deps.ffmpeg/patches/mbedtls/0002-enable-dtls-srtp-support.patch forkDstPrefix/deps.ffmpeg/patches/mbedtls/0002-enable-dtls-srtp-support.patch index 762bb8635348a7e2e963a2d2a0d6c2a6e444bd1a..e9e7d412a8eb12a7ad97902326c18ef342a0f8e2 100644 --- forkSrcPrefix/deps.ffmpeg/patches/mbedtls/0002-enable-dtls-srtp-support.patch +++ forkDstPrefix/deps.ffmpeg/patches/mbedtls/0002-enable-dtls-srtp-support.patch @@ -1,8 +1,6 @@ -diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h -index 42485b76b..d823dc02c 100644 ---- a/include/mbedtls/mbedtls_config.h -+++ b/include/mbedtls/mbedtls_config.h -@@ -1787,7 +1787,7 @@ +--- ./include/mbedtls/mbedtls_config.h ++++ ./include/mbedtls/mbedtls_config.h +@@ -1788,7 +1788,7 @@ * * Uncomment this to enable support for use_srtp extension. */ diff --git forkSrcPrefix/deps.ffmpeg/60-mbedtls.zsh forkDstPrefix/deps.ffmpeg/60-mbedtls.zsh index d93e47189d4128314a5557349bd392c93e571294..e6f02ebd9d2493c6ec3140e0c38f6d3de9ec0bcb 100644 --- forkSrcPrefix/deps.ffmpeg/60-mbedtls.zsh +++ forkDstPrefix/deps.ffmpeg/60-mbedtls.zsh @@ -3,27 +3,27 @@ autoload -Uz log_debug log_error log_info log_status log_output ## Dependency Information local name='mbedtls' local -A versions=( - macos 3.2.1 - linux 3.2.1 - windows 3.2.1 + macos 3.4.0 + linux 3.4.0 + windows 3.4.0 ) local url='https://github.com/Mbed-TLS/mbedtls.git' local -A hashes=( - macos 8c89224991adff88d53cd380f42a2baa36f91454 - linux 8c89224991adff88d53cd380f42a2baa36f91454 - windows 8c89224991adff88d53cd380f42a2baa36f91454 + macos 1873d3bfc2da771672bd8e7e8f41f57e0af77f33 + linux 1873d3bfc2da771672bd8e7e8f41f57e0af77f33 + windows 1873d3bfc2da771672bd8e7e8f41f57e0af77f33 ) local -a patches=( "macos ${0:a:h}/patches/mbedtls/0001-enable-posix-threading-support.patch \ ea52cf47ca01211cbadf03c0493986e8d4e0d1e9ab4aaa42365b2dea7b591188" "macos ${0:a:h}/patches/mbedtls/0002-enable-dtls-srtp-support.patch \ - 6c5f88b9758285f848ec6e0f07c943f07b3d7c54eed135afec47282667e625b9" + bca47a5a51ef32f562b470fa330876862c6bc29c89b4c16ae2ea1edc46f703cb" "linux ${0:a:h}/patches/mbedtls/0001-enable-posix-threading-support.patch \ ea52cf47ca01211cbadf03c0493986e8d4e0d1e9ab4aaa42365b2dea7b591188" "linux ${0:a:h}/patches/mbedtls/0002-enable-dtls-srtp-support.patch \ - 6c5f88b9758285f848ec6e0f07c943f07b3d7c54eed135afec47282667e625b9" + bca47a5a51ef32f562b470fa330876862c6bc29c89b4c16ae2ea1edc46f703cb" "windows ${0:a:h}/patches/mbedtls/0002-enable-dtls-srtp-support.patch \ - 6c5f88b9758285f848ec6e0f07c943f07b3d7c54eed135afec47282667e625b9" + bca47a5a51ef32f562b470fa330876862c6bc29c89b4c16ae2ea1edc46f703cb" ) ## Dependency Overrides @@ -70,8 +70,8 @@ config() { args=( ${cmake_flags} - -DUSE_SHARED_MBEDTLS_LIBRARY="${_onoff[(( shared_libs + 1 ))]}" - -DUSE_STATIC_MBEDTLS_LIBRARY=ON + -DUSE_SHARED_MBEDTLS_LIBRARY=ON + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DGEN_FILES=OFF diff --git forkSrcPrefix/deps.ffmpeg/70-libdatachannel.zsh forkDstPrefix/deps.ffmpeg/70-libdatachannel.zsh index d1c2e64e6dc8be34dcf6cb71e80b05ff93d2f6c6..21bc7add3b431427caf5904904ce2037355c09a8 100644 --- forkSrcPrefix/deps.ffmpeg/70-libdatachannel.zsh +++ forkDstPrefix/deps.ffmpeg/70-libdatachannel.zsh @@ -2,9 +2,9 @@ autoload -Uz log_debug log_error log_info log_status log_output ## Dependency Information local name='libdatachannel' -local version='0.18.3' -local url='https://github.com/Sean-Der/libdatachannel.git' -local hash='8935bd0c07e41819753c18ca6d82e5a490556b76' +local version='0.19.0' +local url='https://github.com/paullouisageneau/libdatachannel.git' +local hash='f66f2813c11acaea3b20d9a5f115823777426e63' ## Dependency Overrides local -i shared_libs=1 @@ -89,6 +89,13 @@ fixup() { if (( shared_libs )) { autoload -Uz create_importlibs create_importlibs ${target_config[output_dir]}/bin/libdatachannel*.dll + log_status "Fixing cmake for msvc import library syntax" + if [[ "${config}" = "Release" ]] { + sed -i 's/libdatachannel.dll.a/libdatachannel.lib/g' ${target_config[output_dir]}/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake + } + if [[ "${config}" = "RelWithDebInfo" ]] { + sed -i 's/libdatachannel.dll.a/libdatachannel.lib/g' ${target_config[output_dir]}/lib/cmake/LibDataChannel/LibDataChannelTargets-relwithdebinfo.cmake + } } autoload -Uz restore_dlls && restore_dlls