From d9abce8df05ce39eb6a663dac6481729f72413be Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Tue, 5 Dec 2023 00:49:52 +0000 Subject: [PATCH 1/2] meson.build: build libsrtp2 with mbedtls support --- meson.build | 2 +- subprojects/libsrtp2.wrap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index ff342b921..2a5382dce 100644 --- a/meson.build +++ b/meson.build @@ -133,7 +133,7 @@ if usessl endif mist_deps += [mbedtls, mbedx509, mbedcrypto] - mist_deps += dependency('libsrtp2', default_options: ['tests=disabled'], fallback: ['libsrtp2', 'libsrtp2_dep']) + mist_deps += dependency('libsrtp2', default_options: ['tests=disabled', 'crypto-library=mbedtls'], fallback: ['libsrtp2', 'libsrtp2_dep']) endif libsrt = false diff --git a/subprojects/libsrtp2.wrap b/subprojects/libsrtp2.wrap index 752ee2768..3d3d86dc2 100644 --- a/subprojects/libsrtp2.wrap +++ b/subprojects/libsrtp2.wrap @@ -1,7 +1,7 @@ [wrap-git] directory = libsrtp -url = https://github.com/cisco/libsrtp.git -revision = 1b6deccb216e3cd88bf7ce563b34557b3897c2dd +url = https://github.com/livepeer/libsrtp.git +revision = add83055f7445458fca60723c4e99c10ab382ea5 [provide] libsrtp2 = libsrtp2_dep From 4a0bcdae2f045a291104fd03503c463096524547 Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Tue, 5 Dec 2023 20:51:49 +0000 Subject: [PATCH 2/2] srtp2: use nss --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2a5382dce..a1563c3bd 100644 --- a/meson.build +++ b/meson.build @@ -133,7 +133,7 @@ if usessl endif mist_deps += [mbedtls, mbedx509, mbedcrypto] - mist_deps += dependency('libsrtp2', default_options: ['tests=disabled', 'crypto-library=mbedtls'], fallback: ['libsrtp2', 'libsrtp2_dep']) + mist_deps += dependency('libsrtp2', default_options: ['tests=disabled', 'crypto-library=nss'], fallback: ['libsrtp2', 'libsrtp2_dep']) endif libsrt = false