diff options
| author | George Joseph <gjoseph@digium.com> | 2016-10-31 15:12:57 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-10-31 16:15:09 -0500 |
| commit | f27f837a9f5fae97af6e86d7d5f1f645e7c12186 (patch) | |
| tree | c8e165112697b92c89f3a12e59753338b9164ad4 /third-party/pjproject/apply_patches | |
| parent | 3ad4719917c106a79546676ffec22af9a0921eb4 (diff) | |
pjproject_bundled: Fix compile of pjsua so it handles audio
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
Diffstat (limited to 'third-party/pjproject/apply_patches')
| -rwxr-xr-x | third-party/pjproject/apply_patches | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/third-party/pjproject/apply_patches b/third-party/pjproject/apply_patches index 69a0ad0c1..5f9fde283 100755 --- a/third-party/pjproject/apply_patches +++ b/third-party/pjproject/apply_patches @@ -28,16 +28,6 @@ if [ ! "$(ls -A $patchdir/*.patch 2>/dev/null)" ] ; then exit 0 fi -if patch --dry-run </dev/null >/dev/null 2>&1 ; then - DRY_RUN=--dry-run -else - DRY_RUN=-C -fi - -for patchfile in $patchdir/*.patch ; do - ${PATCH} -d $sourcedir -p1 -s -r- -f -N $DRY_RUN -i "$patchfile" || (echo "Patchfile $(basename $patchfile) failed to apply" >&2 ; exit 1) || exit 1 -done - for patchfile in "$patchdir"/*.patch ; do [ -z $quiet ] && echo "Applying patch $(basename $patchfile)" ${PATCH} -d "$sourcedir" -p1 -s -i "$patchfile" || exit 1 |