mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-03 19:16:46 +00:00
a36a7d0cf4
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
143 lines
4.5 KiB
Diff
143 lines
4.5 KiB
Diff
diff --git a/build.mak.in b/build.mak.in
|
|
index 802211c..25fd05e 100644
|
|
--- a/build.mak.in
|
|
+++ b/build.mak.in
|
|
@@ -1,4 +1,3 @@
|
|
-export PJDIR := @ac_pjdir@
|
|
include $(PJDIR)/version.mak
|
|
export PJ_DIR := $(PJDIR)
|
|
|
|
@@ -9,7 +8,7 @@ export HOST_NAME := unix
|
|
export CC_NAME := gcc
|
|
export TARGET_NAME := @target@
|
|
export CROSS_COMPILE := @ac_cross_compile@
|
|
-export LINUX_POLL := @ac_linux_poll@
|
|
+export LINUX_POLL := @ac_linux_poll@
|
|
export SHLIB_SUFFIX := @ac_shlib_suffix@
|
|
|
|
export prefix := @prefix@
|
|
@@ -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)
|
|
-# External SRTP library
|
|
-APP_THIRD_PARTY_EXT += -lsrtp
|
|
-else
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lsrtp-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lsrtp
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(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
|
|
-APP_THIRD_PARTY_EXT += -lgsm
|
|
-else
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lgsmcodec
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX)
|
|
-endif
|
|
-endif
|
|
-endif
|
|
-
|
|
-ifneq (@ac_no_speex_codec@,1)
|
|
-ifeq (@ac_external_speex@,1)
|
|
-APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
|
|
-else
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lspeex
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX)
|
|
-endif
|
|
-endif
|
|
-endif
|
|
-
|
|
-ifneq (@ac_no_ilbc_codec@,1)
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lilbccodec
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX)
|
|
-endif
|
|
-endif
|
|
-
|
|
-ifneq (@ac_no_g7221_codec@,1)
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lg7221codec
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX)
|
|
-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)
|
|
-ifeq (@ac_external_yuv@,1)
|
|
-APP_THIRD_PARTY_EXT += -lyuv
|
|
-else
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lyuv-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lyuv
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX)
|
|
-endif
|
|
-endif
|
|
-endif
|
|
-
|
|
-
|
|
# Additional flags
|
|
@ac_build_mak_vars@
|
|
|
|
@@ -149,7 +56,7 @@ SDL_CFLAGS = @ac_sdl_cflags@
|
|
SDL_LDFLAGS = @ac_sdl_ldflags@
|
|
|
|
# FFMPEG flags
|
|
-FFMPEG_CFLAGS = @ac_ffmpeg_cflags@
|
|
+FFMPEG_CFLAGS = @ac_ffmpeg_cflags@
|
|
FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@
|
|
|
|
# Video4Linux2
|
|
@@ -157,7 +64,7 @@ V4L2_CFLAGS = @ac_v4l2_cflags@
|
|
V4L2_LDFLAGS = @ac_v4l2_ldflags@
|
|
|
|
# OPENH264 flags
|
|
-OPENH264_CFLAGS = @ac_openh264_cflags@
|
|
+OPENH264_CFLAGS = @ac_openh264_cflags@
|
|
OPENH264_LDFLAGS = @ac_openh264_ldflags@
|
|
|
|
# QT
|