diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-03-23 07:59:12 -0600 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-03-23 08:02:13 -0600 |
| commit | d963a3374991c64594cf196e90a5c74964c8ba7c (patch) | |
| tree | 44809bf9222b4d3029fbc903ca6be22d5b0d36eb /third-party | |
| parent | 7d6782cc0feb5357c6e9feb7c810f7fbe76190f0 (diff) | |
pjproject-bundled: Cleanups for reported issues
PortAudio should no longer be required
PJSIP_MAX_PKT_LEN is now 6000
Older autoconf issue fixed. (CentOS 6)
Change-Id: I463fa9586cbe7c6b3b603289f535bd8e361611dd
Diffstat (limited to 'third-party')
3 files changed, 51 insertions, 2 deletions
diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules index f39629b92..062793f12 100644 --- a/third-party/pjproject/Makefile.rules +++ b/third-party/pjproject/Makefile.rules @@ -2,6 +2,6 @@ PJPROJECT_URL = http://www.pjsip.org/release/$(PJPROJECT_VERSION) # Even though we're not installing pjproject, we're setting prefix to /opt/pjproject to be safe PJPROJECT_CONFIG_OPTS = --prefix=/opt/pjproject --with-external-speex --with-external-gsm --with-external-srtp \ - --with-external-pa --disable-video --disable-v4l2 --disable-sound \ - --disable-opencore-amr --disable-ilbc-codec --without-libyuv --disable-g7221-codec \ + --disable-video --disable-v4l2 --disable-sound --disable-opencore-amr --disable-ilbc-codec \ + --without-libyuv --disable-g7221-codec \ --enable-epoll diff --git a/third-party/pjproject/patches/0002-aconfigure.ac-Fix-autoconf-issue-with-opencore-amrnb.patch b/third-party/pjproject/patches/0002-aconfigure.ac-Fix-autoconf-issue-with-opencore-amrnb.patch new file mode 100644 index 000000000..04d1d9703 --- /dev/null +++ b/third-party/pjproject/patches/0002-aconfigure.ac-Fix-autoconf-issue-with-opencore-amrnb.patch @@ -0,0 +1,48 @@ +From 1281b60a1807d1285b101b6eb61c6478f29785fe Mon Sep 17 00:00:00 2001 +From: George Joseph <george.joseph@fairview5.com> +Date: Wed, 23 Mar 2016 07:48:52 -0600 +Subject: [PATCH] aconfigure.ac: Fix autoconf issue with opencore-amrnb on + older systems + +autoconf 2.63 on CentOS6 produces a bad ./aconfigure file related to +opencore-amrnb. + +./aconfigure: line 15158: syntax error near unexpected token `fi' + +To get around this, a 'true;' needed to be added to the Ok case of +AC_ARG_WITH(opencore-amrnb) +--- + aconfigure | 3 +++ + aconfigure.ac | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/aconfigure b/aconfigure +index 33a08f5..4c122c2 100755 +--- a/aconfigure ++++ b/aconfigure +@@ -7908,6 +7908,9 @@ fi + # Check whether --with-opencore-amrnb was given. + if test "${with_opencore_amrnb+set}" = set; then : + withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5 ++else ++ true; ++ + fi + + +diff --git a/aconfigure.ac b/aconfigure.ac +index 3e88124..5d3e833 100644 +--- a/aconfigure.ac ++++ b/aconfigure.ac +@@ -1631,7 +1631,7 @@ AC_ARG_WITH(opencore-amrnb, + AC_HELP_STRING([--with-opencore-amrnb=DIR], + [This option is obsolete and replaced by --with-opencore-amr=DIR]), + [AC_MSG_ERROR(This option is obsolete and replaced by --with-opencore-amr=DIR)], +- [] ++ [true;] + ) + + dnl # opencore-amr alt prefix +-- +2.5.0 + diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h index 544c1e85e..840d8b279 100644 --- a/third-party/pjproject/patches/config_site.h +++ b/third-party/pjproject/patches/config_site.h @@ -29,6 +29,7 @@ #define PJ_HAS_STRICMP_ALNUM 0 #define PJ_HASH_USE_OWN_TOLOWER 1 #define PJSIP_UNESCAPE_IN_PLACE 1 +#define PJSIP_MAX_PKT_LEN 6000 #undef PJ_TODO #define PJ_TODO(x) |