summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2019-03-29 12:09:02 +0000
committerTim-Philipp Müller <tim@centricular.com>2019-03-29 12:09:52 +0000
commit4c0fa970bc58d59efe1882cb3fd9742931419143 (patch)
treee9a7cea347ed89d704ee64632f45d4437c1eeb65
parent8e4d7c364283528ac1348501360760a389138546 (diff)
downloadgstreamer-plugins-bad-4c0fa970bc58d59efe1882cb3fd9742931419143.tar.gz
srtp: bump libsrtp requirement to 1.6.0
See !234
-rw-r--r--configure.ac2
-rw-r--r--ext/srtp/meson.build4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 4b41496da..cd3b7a9aa 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 0a296869a..3ce67827f 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