From 4c0fa970bc58d59efe1882cb3fd9742931419143 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 29 Mar 2019 12:09:02 +0000 Subject: [PATCH] srtp: bump libsrtp requirement to 1.6.0 See !234 --- configure.ac | 2 +- ext/srtp/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 4b41496..cd3b7a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1550,7 +1550,7 @@ AG_GST_CHECK_FEATURE(SRTP, [srtp library], srtp, [ AC_DEFINE([HAVE_SRTP2], 1, [Define if libsrtp2 is used]) else PKG_CHECK_MODULES(SRTP, libsrtp, HAVE_SRTP="yes", - AG_GST_CHECK_LIBHEADER(SRTP, srtp, srtp_init, , srtp/srtp.h, SRTP_LIBS="-lsrtp") + AG_GST_CHECK_LIBHEADER(SRTP, srtp, crypto_policy_set_aes_gcm_128_16_auth, , srtp/srtp.h, SRTP_LIBS="-lsrtp") ) fi AC_SUBST(SRTP_LIBS) diff --git a/ext/srtp/meson.build b/ext/srtp/meson.build index 0a29686..3ce6782 100644 --- a/ext/srtp/meson.build +++ b/ext/srtp/meson.build @@ -13,8 +13,8 @@ srtp_dep = dependency('libsrtp2', version : '>= 2.1.0', required : false) if srtp_dep.found() srtp_cargs += ['-DHAVE_SRTP2'] else - srtp_dep = dependency('libsrtp', required : false) - if not srtp_dep.found() and cc.has_header_symbol('srtp/srtp.h', 'srtp_init') + srtp_dep = dependency('libsrtp', version: '>= 1.6.0', required : false) + if not srtp_dep.found() and cc.has_header_symbol('srtp/srtp.h', 'crypto_policy_set_aes_gcm_128_16_auth') srtp_dep = cc.find_library('srtp', required : false) endif endif -- 2.7.4