pjproject: bump to 2.7.1

- Update from 2.6 to 2.7.1.
- Update sed script because the TARGET_CFLAGS now occur twice in the .pc
  file.
- Upgrade dependency from libsrtp to libsrtp2.
- Drop patches that were included upstream.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile
index 2c4d2ec3ae9a33d68bbc145fea032b93ad86c726..d3305d4ebde9176ef4848f7f69111bb5671180dd 100644 (file)
--- a/libs/pjproject/Makefile
+++ b/libs/pjproject/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pjproject
-PKG_VERSION:=2.6
-PKG_RELEASE:=3
+PKG_VERSION:=2.7.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)
-PKG_HASH:=2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4
+PKG_HASH:=59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 
@@ -56,6 +56,7 @@ endef
 
 CONFIGURE_ARGS+= \
        $(if $(CONFIG_SOFT_FLOAT),--disable-floating-point) \
+       --disable-bcg729 \
        --disable-ext-sound \
        --disable-ffmpeg \
        --disable-g711-codec \
@@ -104,16 +105,16 @@ define Build/InstallDev
        $(foreach m,$(PJPROJECT_LIBS),$(CP) $(PKG_INSTALL_DIR)/usr/lib/$(m)* $(1)/usr/lib;)
 
        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(SED) 's|$(TARGET_CFLAGS)||' $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc
+       $(SED) 's|$(TARGET_CFLAGS)||g' $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpjproject.pc $(1)/usr/lib/pkgconfig
 endef
 
 $(eval $(call PJSIPpackage,libpj,libpj,+librt))
 $(eval $(call PJSIPpackage,libpjlib-util,libpjlib-util,+libpj +librt))
-$(eval $(call PJSIPpackage,libpjmedia,libpjmedia*,+libpj +libpjlib-util +libpjnath +librt +libsrtp))
+$(eval $(call PJSIPpackage,libpjmedia,libpjmedia*,+libpj +libpjlib-util +libpjnath +librt +libsrtp2))
 $(eval $(call PJSIPpackage,libpjnath,libpjnath,+libpj +libpjlib-util +librt))
 $(eval $(call PJSIPpackage,libpjsip-simple,libpjsip-simple,+libpj +libpjlib-util +libpjsip +librt))
 $(eval $(call PJSIPpackage,libpjsip-ua,libpjsip-ua,+libpj +libpjlib-util +libpjmedia +libpjsip-simple +libpjsip +librt))
-$(eval $(call PJSIPpackage,libpjsip,libpjsip,+libpj +libpjlib-util +librt +libsrtp))
+$(eval $(call PJSIPpackage,libpjsip,libpjsip,+libpj +libpjlib-util +librt +libsrtp2))
 $(eval $(call PJSIPpackage,libpjsua,libpjsua,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +librt))
 $(eval $(call PJSIPpackage,libpjsua2,libpjsua2,+libpj +libpjlib-util +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsip +librt +libpjsua))

diff --git a/libs/pjproject/patches/130-Parse-zero-length-multipart-body-parts-correctly.patch b/libs/pjproject/patches/130-Parse-zero-length-multipart-body-parts-correctly.patch
deleted file mode 100644 (file)
index 3fd2593..0000000
--- a/libs/pjproject/patches/130-Parse-zero-length-multipart-body-parts-correctly.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f0c717463d569f87a16f9b014033c8ca8939a7b4 Mon Sep 17 00:00:00 2001
-From: Mark Michelson <mmichelson@digium.com>
-Date: Thu, 13 Apr 2017 16:59:40 -0500
-Subject: [PATCH] Parse zero-length multipart body parts correctly.
-
-The calculation of end_body could result in a negative length being
-passed to multipart_body_parse_part().
----
- pjsip/src/pjsip/sip_multipart.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
---- a/pjsip/src/pjsip/sip_multipart.c
-+++ b/pjsip/src/pjsip/sip_multipart.c
-@@ -646,13 +646,15 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_
- 
-       end_body = curptr;
- 
--      /* The newline preceeding the delimiter is conceptually part of
--       * the delimiter, so trim it from the body.
--       */
--      if (*(end_body-1) == '\n')
--          --end_body;
--      if (*(end_body-1) == '\r')
--          --end_body;
-+      if (end_body > start_body) {
-+          /* The newline preceeding the delimiter is conceptually part of
-+           * the delimiter, so trim it from the body.
-+           */
-+          if (*(end_body-1) == '\n')
-+              --end_body;
-+          if (*(end_body-1) == '\r')
-+               --end_body;
-+      }
- 
-       /* Now that we have determined the part's boundary, parse it
-        * to get the header and body part of the part.

diff --git a/libs/pjproject/patches/140-Ensure-2543-transaction-key-buffer-is-large-enough.patch b/libs/pjproject/patches/140-Ensure-2543-transaction-key-buffer-is-large-enough.patch
deleted file mode 100644 (file)
index 35e8223..0000000
--- a/libs/pjproject/patches/140-Ensure-2543-transaction-key-buffer-is-large-enough.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b5f0f8868363c482a2c4ce343e3ee6ad256b0708 Mon Sep 17 00:00:00 2001
-From: Mark Michelson <mmichelson@digium.com>
-Date: Thu, 13 Apr 2017 16:20:07 -0500
-Subject: [PATCH] Ensure 2543 transaction key buffer is large enough.
-
-The CSeq method length needs to be factored into the allocated buffer
-length. Otherwise, the buffer may not be large enough to accommodate the
-entire key.
----
- pjsip/src/pjsip/sip_transaction.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/pjsip/src/pjsip/sip_transaction.c
-+++ b/pjsip/src/pjsip/sip_transaction.c
-@@ -288,7 +288,8 @@ static pj_status_t create_tsx_key_2543(
-     host = &rdata->msg_info.via->sent_by.host;
- 
-     /* Calculate length required. */
--    len_required = 9 +                            /* CSeq number */
-+    len_required = method->name.slen +            /* Method */
-+                 9 +                      /* CSeq number */
-                  rdata->msg_info.from->tag.slen +   /* From tag. */
-                  rdata->msg_info.cid->id.slen +    /* Call-ID */
-                  host->slen +             /* Via host. */