From 86e09b6ed17ad6ea0f3c2dafa8fd4ba112f43347 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Sep 2021 22:25:23 +0200 Subject: [PATCH] package/libsrtp: bump to version 2.4.1 - libnss is an optional dependency since version 2.3.0 and https://github.com/cisco/libsrtp/commit/a946b3f561757a08b879cb337bfa932086df3081 - Drop comment about pkg-config as libsrtp uses PKG_CHECK_MODULES to find libnss and openssl - Update indentation in hash file (two spaces) https://github.com/cisco/libsrtp/blob/v2.4.1/CHANGES Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libsrtp/libsrtp.hash | 4 ++-- package/libsrtp/libsrtp.mk | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/package/libsrtp/libsrtp.hash b/package/libsrtp/libsrtp.hash index d4b7b54d03..3de0130f4c 100644 --- a/package/libsrtp/libsrtp.hash +++ b/package/libsrtp/libsrtp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 44fd7497bce78767e96b54a11bca520adb2ad32effd515f04bce602b60a1a50b libsrtp-2.2.0.tar.gz -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE +sha256 3cb580928fcd502426809c68406d04aaa5ef1af7ebb0a3a41a52a13576f2fc07 libsrtp-2.4.1.tar.gz +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae LICENSE diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index 5cbd97957a..885f05a33c 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSRTP_VERSION = 2.2.0 +LIBSRTP_VERSION = 2.4.1 LIBSRTP_SITE = $(call github,cisco,libsrtp,v$(LIBSRTP_VERSION)) LIBSRTP_INSTALL_STAGING = YES LIBSRTP_LICENSE = BSD-3-Clause @@ -19,18 +19,17 @@ else LIBSRTP_MAKE_OPTS = libsrtp2.a shared_library endif -# While libsrtp is not using pkg-config itself, it checks if -# pkg-config is available to determine whether it should install -# libsrtp.pc. Since installing it seems useful, let's depend on -# host-pkgconf to make sure pkg-config is installed. LIBSRTP_DEPENDENCIES = host-pkgconf # openssl handling needs libdl support ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) LIBSRTP_DEPENDENCIES += openssl -LIBSRTP_CONF_OPTS += --enable-openssl +LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl +else ifeq ($(BR2_PACKAGE_LIBNSS),y) +LIBSRTP_DEPENDENCIES += libnss +LIBSRTP_CONF_OPTS += --enable-nss --disable-openssl else -LIBSRTP_CONF_OPTS += --disable-openssl +LIBSRTP_CONF_OPTS += --disable-nss --disable-openssl endif $(eval $(autotools-package))