mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-02 11:06:31 +00:00
58636a6ea6
Removed multiple patches. Code chages in res_pjsip_pubsub due to changes in evsub. Pjsip now calls on_evsub_state() before on_rx_refresh(), so the sub tree deletion that used to take place in on_evsub_state() now must take place in on_rx_refresh(). Additionally, pjsip now requires that you send the NOTIFY from within on_rx_refresh(), otherwise it will assert when going to send the 200 OK. The idea is that it will look for this NOTIFY and cache it until after sending the response in order to deal with the self-imposed message mis-order. Asterisk previously dealt with this by pushing the NOTIFY in on_rx_refresh(), but pjsip now forces us to use it's method. Changes were required to configure in order to detect which way pjsip handles this as the two are not compatible for the reasons mentioned above. A corresponding change in testsuite is required in order to deal with the small interal timing changes caused by moving the NOTIFY send. ASTERISK-30325 Change-Id: I50b00cac89d950d3511d7b250a1c641965d9fe7f
135 lines
4.4 KiB
Diff
135 lines
4.4 KiB
Diff
diff --git a/build.mak.in b/build.mak.in
|
|
index 4bc464f8c..80681d961 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)
|
|
|
|
@@ -42,21 +41,6 @@ export APP_THIRD_PARTY_EXT :=
|
|
export APP_THIRD_PARTY_LIBS :=
|
|
export APP_THIRD_PARTY_LIB_FILES :=
|
|
|
|
-ifneq (@ac_no_srtp@,1)
|
|
-ifneq (@ac_external_srtp@,0)
|
|
-# External SRTP library
|
|
-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),)
|
|
-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
|
|
-endif
|
|
-
|
|
ifeq (@ac_pjmedia_resample@,libresample)
|
|
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
|
|
ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
@@ -73,102 +57,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
|
|
-
|
|
-ifeq (@ac_external_pa@,1)
|
|
-# External PA
|
|
-APP_THIRD_PARTY_EXT += -lportaudio
|
|
-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
|
|
-
|
|
-ifneq (@ac_no_webrtc@,1)
|
|
-ifeq (@ac_external_webrtc@,1)
|
|
-APP_THIRD_PARTY_EXT += -lwebrtc
|
|
-else
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lwebrtc-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lwebrtc
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
|
|
-endif
|
|
-endif
|
|
-endif
|
|
-
|
|
-ifneq (@ac_no_webrtc_aec3@,1)
|
|
-ifeq (@ac_external_webrtc_aec3@,1)
|
|
-APP_THIRD_PARTY_EXT += -lwebrtc-aec3
|
|
-else
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3-$(LIB_SUFFIX)
|
|
-ifeq ($(PJ_SHARED_LIBRARIES),)
|
|
-APP_THIRD_PARTY_LIBS += -lwebrtc-aec3-$(TARGET_NAME)
|
|
-else
|
|
-APP_THIRD_PARTY_LIBS += -lwebrtc-aec3
|
|
-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
|
|
-endif
|
|
-endif
|
|
-endif
|
|
-
|
|
|
|
# Additional flags
|
|
@ac_build_mak_vars@
|