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

pjproject_bundled: Fix compile of pjsua so it handles audio

Browse Source 
In order for pjsua and its python binding to actually negotiate
audio for the testsuite tests, it needs g711 and resample.  The
pj* libraries themselves do not.  Unfortunately, pjproject relies
on a brand new libresample that most distros don't ship so we need
to use the libresample already bundled with pjproject.  Only the pjsua
executable and the _pjsua.so python library are linked with it so it
shouldn't interfere with asterisk itself.

Also it was pointed out that apply_patches couldn't handle multiple
patches that depended on each other during the dry-run, so the
dry-run was removed.

Change-Id: I24f397462b486dcdde0dcafe40e6c55a6593f098
This commit is contained in:
George Joseph
2016-10-31 15:12:57 -06:00
parent 55435e211b
commit a36a7d0cf4
4 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
diff --git a/build.mak.in b/build.mak.in
index 802211c..006d887 100644
index 802211c..25fd05e 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -1,4 +1,3 @@
@@ -7,7 +7,7 @@ index 802211c..006d887 100644
include $(PJDIR)/version.mak
export PJ_DIR := $(PJDIR)
@@ -9,7 +9,7 @@ export HOST_NAME := unix
@@ -9,7 +8,7 @@ export HOST_NAME := unix
export CC_NAME := gcc
export TARGET_NAME := @target@
export CROSS_COMPILE := @ac_cross_compile@
@@ -16,7 +16,7 @@ index 802211c..006d887 100644
export SHLIB_SUFFIX := @ac_shlib_suffix@
export prefix := @prefix@
@@ -28,114 +28,6 @@ export APP_THIRD_PARTY_EXT :=
@@ -28,19 +27,6 @@ export APP_THIRD_PARTY_EXT :=
export APP_THIRD_PARTY_LIBS :=
export APP_THIRD_PARTY_LIB_FILES :=
@@ -33,22 +33,13 @@ index 802211c..006d887 100644
-endif
-endif
-
-ifeq (@ac_pjmedia_resample@,libresample)
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
-ifeq ($(PJ_SHARED_LIBRARIES),)
-ifeq (@ac_resample_dll@,1)
-export PJ_RESAMPLE_DLL := 1
-APP_THIRD_PARTY_LIBS += -lresample
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
-else
-APP_THIRD_PARTY_LIBS += -lresample-$(TARGET_NAME)
-endif
-else
-APP_THIRD_PARTY_LIBS += -lresample
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
-endif
-endif
-
ifeq (@ac_pjmedia_resample@,libresample)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
ifeq ($(PJ_SHARED_LIBRARIES),)
@@ -57,85 +43,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
endif
endif
-ifneq (@ac_no_gsm_codec@,1)
-ifeq (@ac_external_gsm@,1)
-# External GSM library
@@ -131,7 +122,7 @@ index 802211c..006d887 100644
# Additional flags
@ac_build_mak_vars@
@@ -149,7 +41,7 @@ SDL_CFLAGS = @ac_sdl_cflags@
@@ -149,7 +56,7 @@ SDL_CFLAGS = @ac_sdl_cflags@
SDL_LDFLAGS = @ac_sdl_ldflags@
# FFMPEG flags
@@ -140,7 +131,7 @@ index 802211c..006d887 100644
FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@
# Video4Linux2
@@ -157,7 +49,7 @@ V4L2_CFLAGS = @ac_v4l2_cflags@
@@ -157,7 +64,7 @@ V4L2_CFLAGS = @ac_v4l2_cflags@
V4L2_LDFLAGS = @ac_v4l2_ldflags@
# OPENH264 flags