diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2017-10-17 10:53:52 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2017-10-20 14:26:14 -0500 |
| commit | b57dcc8d9c065b0b246c0911379a789b7089f7d6 (patch) | |
| tree | c389c317aba3d1a49221a78d5eb70af764b807b0 /third-party/pjproject/patches/0000-remove-third-party.patch | |
| parent | fb4ed70e629db9b3264ac5cea03a696048639462 (diff) | |
res_pjproject.c: Upgrade bundled PJPROJECT to 2.7
Update patches included in bundled PJPROJECT for the new version.
ASTERISK-27355
Change-Id: I9ac5dbbffaadca25ad24fac8b9ab615e5ace6083
Diffstat (limited to 'third-party/pjproject/patches/0000-remove-third-party.patch')
| -rw-r--r-- | third-party/pjproject/patches/0000-remove-third-party.patch | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/third-party/pjproject/patches/0000-remove-third-party.patch b/third-party/pjproject/patches/0000-remove-third-party.patch index 81c53a0c3..7cde2f44e 100644 --- a/third-party/pjproject/patches/0000-remove-third-party.patch +++ b/third-party/pjproject/patches/0000-remove-third-party.patch @@ -1,21 +1,28 @@ +From 1ec66eb253c603e06fedff5710e701dc0e55c697 Mon Sep 17 00:00:00 2001 +From: Richard Mudgett <rmudgett@digium.com> +Date: Thu, 23 Feb 2017 17:10:07 -0600 +Subject: [PATCH 1/3] 0000-remove-third-party.patch + +--- + build.mak.in | 107 ----------------------------------------------------------- + 1 file changed, 107 deletions(-) + diff --git a/build.mak.in b/build.mak.in -index eb28663..83024ef 100644 +index 6c263a9..36e7ff4 100644 --- a/build.mak.in +++ b/build.mak.in -@@ -1,6 +1,5 @@ +@@ -1,4 +1,3 @@ -export PJDIR := @ac_pjdir@ include $(PJDIR)/version.mak export PJ_DIR := $(PJDIR) - # @configure_input@ - export MACHINE_NAME := auto @@ -28,19 +27,6 @@ export APP_THIRD_PARTY_EXT := export APP_THIRD_PARTY_LIBS := export APP_THIRD_PARTY_LIB_FILES := --ifeq (@ac_external_srtp@,1) +-ifneq (@ac_external_srtp@,0) -# External SRTP library --APP_THIRD_PARTY_EXT += -lsrtp +-APP_THIRD_PARTY_EXT += -l@ac_external_srtp_lib@ -else -APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) -ifeq ($(PJ_SHARED_LIBRARIES),) @@ -129,3 +136,6 @@ index eb28663..83024ef 100644 # Additional flags @ac_build_mak_vars@ +-- +2.7.4 + |