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

pjproject: Upgrade to 2.8.

Browse Source 
This change brings in PJSIP 2.8, removes all the patches
that were merged upstream, and makes a minor change to
support a breaking change that was done.

ASTERISK-28059

Change-Id: I5097772b11b0f95c3c1f52df6400158666f0a189
This commit is contained in:
Joshua Colp
2018-09-17 16:38:19 +00:00
parent 3d9deb35f0
commit ce9a980be6
21 changed files with 79 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] 0000-remove-third-party.patch
1 file changed, 107 deletions(-)
diff --git a/build.mak.in b/build.mak.in
index 6c263a9..36e7ff4 100644
index 80ccad12..41ec64ea 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -1,4 +1,3 @@
@@ -16,7 +16,7 @@ index 6c263a9..36e7ff4 100644
include $(PJDIR)/version.mak
export PJ_DIR := $(PJDIR)
@@ -28,19 +27,6 @@ export APP_THIRD_PARTY_EXT :=
@@ -37,19 +36,6 @@ export APP_THIRD_PARTY_EXT :=
export APP_THIRD_PARTY_LIBS :=
export APP_THIRD_PARTY_LIB_FILES :=
@@ -36,7 +36,7 @@ index 6c263a9..36e7ff4 100644
ifeq (@ac_pjmedia_resample@,libresample)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
ifeq ($(PJ_SHARED_LIBRARIES),)
@@ -57,99 +43,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
@@ -66,89 +52,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
endif
endif
@@ -89,19 +89,9 @@ index 6c263a9..36e7ff4 100644
-endif
-endif
-
-ifneq ($(findstring pa,@ac_pjmedia_snd@),)
-ifeq (@ac_external_pa@,1)
-# External PA
-APP_THIRD_PARTY_EXT += -lportaudio
-else
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)
-ifeq ($(PJ_SHARED_LIBRARIES),)
-APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME)
-else
-APP_THIRD_PARTY_LIBS += -lportaudio
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX)
-endif
-endif
-endif
-
-ifneq (@ac_no_yuv@,1)
@@ -136,6 +126,3 @@ index 6c263a9..36e7ff4 100644
# Additional flags
@ac_build_mak_vars@
--
2.7.4