From 48af9ec67b6b7a1b8fdc2eaa976e456e1e6a5840 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 28 Sep 2018 08:37:10 +0200 Subject: [PATCH] pjproject: update to 2.8 Update to the current release, see [0]. Get rid of the dropped --without-oss configure switch. Add an upstream patch to fix building without SRTP support[1], and refresh the rest. [0] https://trac.pjsip.org/repos/milestone/release-2.8 [1] https://trac.pjsip.org/repos/changeset/5891/ Signed-off-by: Andre Heider --- libs/pjproject/Makefile | 7 ++-- .../patches/120-non-gnu-pthreads.patch | 8 ++--- .../160-remove-hardcoded-lstdc++.patch | 2 +- .../patches/170-Fix-build-without-SRTP.patch | 35 +++++++++++++++++++ 4 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 libs/pjproject/patches/170-Fix-build-without-SRTP.patch diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index c9dffee..2b9da08 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject -PKG_VERSION:=2.7.2 -PKG_RELEASE:=3 +PKG_VERSION:=2.8 +PKG_RELEASE:=1 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION) -PKG_HASH:=9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772 +PKG_HASH:=503d0bd7f9f13dc1492ac9b71b761b1089851fbb608b9a13996edc3c42006f79 PKG_INSTALL:=1 PKG_FIXUP:=autoreconf @@ -74,7 +74,6 @@ CONFIGURE_ARGS+= \ --disable-opencore-amr \ --disable-openh264 \ --disable-opus \ - --disable-oss \ --disable-resample \ --disable-sdl \ --disable-silk \ diff --git a/libs/pjproject/patches/120-non-gnu-pthreads.patch b/libs/pjproject/patches/120-non-gnu-pthreads.patch index 23a9b3f..b44cd70 100644 --- a/libs/pjproject/patches/120-non-gnu-pthreads.patch +++ b/libs/pjproject/patches/120-non-gnu-pthreads.patch @@ -1,6 +1,6 @@ ---- pjproject-2.6/pjlib/src/pj/os_core_unix.c 2016-04-13 08:24:48.000000000 +0200 -+++ pjproject-new/pjlib/src/pj/os_core_unix.c 2017-05-08 09:51:49.980905420 +0200 -@@ -1123,7 +1123,7 @@ static pj_status_t init_mutex(pj_mutex_t +--- a/pjlib/src/pj/os_core_unix.c ++++ b/pjlib/src/pj/os_core_unix.c +@@ -1139,7 +1139,7 @@ static pj_status_t init_mutex(pj_mutex_t return PJ_RETURN_OS_ERROR(rc); if (type == PJ_MUTEX_SIMPLE) { @@ -9,7 +9,7 @@ defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE) rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \ -@@ -1133,7 +1133,7 @@ static pj_status_t init_mutex(pj_mutex_t +@@ -1149,7 +1149,7 @@ static pj_status_t init_mutex(pj_mutex_t rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); #endif } else { diff --git a/libs/pjproject/patches/160-remove-hardcoded-lstdc++.patch b/libs/pjproject/patches/160-remove-hardcoded-lstdc++.patch index bf3bfbf..e2bf888 100644 --- a/libs/pjproject/patches/160-remove-hardcoded-lstdc++.patch +++ b/libs/pjproject/patches/160-remove-hardcoded-lstdc++.patch @@ -1,6 +1,6 @@ --- a/build.mak.in +++ b/build.mak.in -@@ -293,7 +293,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) +@@ -292,7 +292,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) $(PJLIB_LDLIB) \ @LIBS@ export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \ diff --git a/libs/pjproject/patches/170-Fix-build-without-SRTP.patch b/libs/pjproject/patches/170-Fix-build-without-SRTP.patch new file mode 100644 index 0000000..8425702 --- /dev/null +++ b/libs/pjproject/patches/170-Fix-build-without-SRTP.patch @@ -0,0 +1,35 @@ +From 42e5ee52e1113d24b7125e29669022c35e87693f Mon Sep 17 00:00:00 2001 +From: Sauw Ming +Date: Wed, 26 Sep 2018 00:56:51 +0000 +Subject: [PATCH] Re #2147 (misc): Fixed build error of undefined reference to + `pjmedia_srtp_enum_crypto' if PJMEDIA_HAS_SRTP is disabled. + +Thanks to Alexei Gradinari for the patch + + + +git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5891 74dad513-b988-da41-8d7b-12977e46ad98 +--- + pjsip/src/pjsua2/endpoint.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/pjsip/src/pjsua2/endpoint.cpp ++++ b/pjsip/src/pjsua2/endpoint.cpp +@@ -2145,14 +2145,16 @@ void Endpoint::resetVideoCodecParam(cons + */ + StringVector Endpoint::srtpCryptoEnum() throw(Error) + { ++ StringVector result; ++#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) + unsigned cnt = PJMEDIA_SRTP_MAX_CRYPTOS; + pjmedia_srtp_crypto cryptos[PJMEDIA_SRTP_MAX_CRYPTOS]; +- StringVector result; + + PJSUA2_CHECK_EXPR(pjmedia_srtp_enum_crypto(&cnt, cryptos)); + + for (unsigned i = 0; i < cnt; ++i) + result.push_back(pj2Str(cryptos[i].name)); ++#endif + + return result; + } -- 2.30.2