meson: add ability to configure libsrtp2 crypto library (defaulting t…

…o mbedtls)

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': get_option('SRTP_CRYPTO_LIBRARY')}, fallback: ['libsrtp2', 'libsrtp2_dep'])
 endif
 
 libsrt = false

meson_options.txt

@@ -24,4 +24,4 @@ option('WITH_JPG', description: 'Build JPG thumbnailer output support (WIP)', ty
 option('WITH_SANITY', description: 'Enable MistOutSanityCheck output for testing purposes', type: 'boolean', value: false)
 option('LSP_MINIFY', description: 'Try to minify LSP JS via java closure-compiler, generally not needed unless changing JS code as a minified version is part of the repository already', type: 'boolean', value: false)
 option('LOCAL_GENERATORS', description: 'Attempts to find a locally-installed version of sourcery and make_html, instead of compiling it', type: 'boolean', value: false)
-
+option('SRTP_CRYPTO_LIBRARY', type: 'combo', choices : ['none', 'openssl', 'nss', 'mbedtls'], value : 'mbedtls', description : 'What external crypto library to leverage for libsrtp2, if any (OpenSSL, NSS, or mbedtls)')

subprojects/libsrtp2.wrap

@@ -1,7 +1,7 @@
 [wrap-git]
 directory = libsrtp
 url = https://github.com/cisco/libsrtp.git
-revision = 1b6deccb216e3cd88bf7ce563b34557b3897c2dd
+revision = 944b0e79daa5737fe150c4da1aacd3d3bc14539b
 
 [provide]
 libsrtp2 = libsrtp2_dep