kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 03:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjproject.c: Upgrade bundled PJPROJECT to 2.7

Browse Source 
Update patches included in bundled PJPROJECT for the new version.

ASTERISK-27355

Change-Id: I9ac5dbbffaadca25ad24fac8b9ab615e5ace6083
This commit is contained in:
Richard Mudgett
2017-10-17 10:53:52 -05:00
parent 4760b2445c
commit e41561fc2a
18 changed files with 55 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
third-party/pjproject/patches/0000-remove-third-party.patch vendored
View File

@@ -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