qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

pjsip: bump to 1.10 and improve ltq_tapi backend

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28963 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2011-11-11 22:23:26 +00:00
parent 409ee4a226
commit 396af9c62b
5 changed files with 692 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/pjsip/Makefile
View File

@ -8,13 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pjsip PKG_NAME:=pjsip
PKG_VERSION:=1.8.5 PKG_VERSION:=1.10
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=pjproject-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/ PKG_SOURCE_URL:=http://www.pjsip.org/release/$(PKG_VERSION)/
PKG_MD5SUM:=f9aa9e58b4d697245eb4bfa7d81a54a3 PKG_MD5SUM:=e215d0637d3422d49a63c2cde6673951
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/pjproject-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/pjproject-$(PKG_VERSION)
@ -36,6 +38,7 @@ CONFIGURE_PREFIX=/usr/pjsip-$(BUILD_VARIANT)
ifeq ($(BUILD_VARIANT),oss) ifeq ($(BUILD_VARIANT),oss)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-floating-point \
--enable-g711-codec \ --enable-g711-codec \
--disable-l16-codec \ --disable-l16-codec \
--disable-g722-codec \ --disable-g722-codec \
@ -51,6 +54,7 @@ endif
ifeq ($(BUILD_VARIANT),ltq-tapi) ifeq ($(BUILD_VARIANT),ltq-tapi)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-floating-point \
--enable-g711-codec \ --enable-g711-codec \
--disable-l16-codec \ --disable-l16-codec \
--disable-g722-codec \ --disable-g722-codec \
@ -80,15 +84,15 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
CFLAGS="$(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) $(LIBGCC_S)" \ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) $(LIBGCC_S) -lm" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/ $(INSTALL_DIR) $(1)/usr
$(CP) $(PKG_INSTALL_DIR)/usr/pjsip-$(BUILD_VARIANT) \ $(CP) $(PKG_INSTALL_DIR)/usr/pjsip-$(BUILD_VARIANT) $(1)/usr
$(1)/usr/
endef endef
define Package/pjsip-$(BUILD_VARIANT)/install define Package/pjsip-$(BUILD_VARIANT)/install

11
package/pjsip/patches/000-aconf.patch
View File

@ -1,15 +1,18 @@
--- a/aconfigure.ac --- a/aconfigure.ac
+++ b/aconfigure.ac +++ b/aconfigure.ac
@@ -48,7 +48,7 @@ @@ -48,9 +48,9 @@ if test -z "$CROSS_COMPILE"; then
CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'` CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
fi fi
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi -if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+AR="${CROSS_COMPILE}ar rv" +AR="${CROSS_COMPILE}ar rv"
AC_SUBST(AR) AC_SUBST(AR)
if test "$LD" = ""; then LD="$CC"; fi -if test "$LD" = ""; then LD="$CC"; fi
+LD="${CROSS_COMPILE}gcc"
AC_SUBST(LD) AC_SUBST(LD)
@@ -590,6 +590,15 @@ if test "$LDOUT" = ""; then LDOUT="-o"; fi
AC_SUBST(LDOUT)
@@ -597,6 +597,15 @@ AC_ARG_ENABLE(ext_sound,
AC_MSG_RESULT([Checking if external sound is set... yes]) AC_MSG_RESULT([Checking if external sound is set... yes])
fi] fi]
) )
@ -27,7 +30,7 @@
AC_SUBST(ac_no_small_filter) AC_SUBST(ac_no_small_filter)
--- a/pjmedia/build/os-auto.mak.in --- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in +++ b/pjmedia/build/os-auto.mak.in
@@ -118,4 +118,11 @@ @@ -118,4 +118,11 @@ ifeq ($(AC_PJMEDIA_SND),external)
export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
endif endif

66
package/pjsip/patches/100-pjsua_acc__snprintf.patch
View File

@ -1,6 +1,6 @@
--- a/pjsip/src/pjsua-lib/pjsua_acc.c --- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -430,7 +430,7 @@ @@ -511,7 +511,7 @@ PJ_DEF(pj_status_t) pjsua_acc_add_local(
"<sip:%s%.*s%s:%d%s>", "<sip:%s%.*s%s:%d%s>",
beginquote, beginquote,
(int)t->local_name.host.slen, (int)t->local_name.host.slen,
@ -9,9 +9,9 @@
endquote, endquote,
t->local_name.port, t->local_name.port,
transport_param); transport_param);
@@ -1158,18 +1158,18 @@ @@ -1327,19 +1327,19 @@ static pj_bool_t acc_check_nat_addr(pjsu
len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE, len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE,
"<sip:%.*s%s%s%.*s%s:%d;transport=%s%.*s>%.*s", "<sip:%.*s%s%s%.*s%s:%d;transport=%s%.*s%s>%.*s",
(int)acc->user_part.slen, (int)acc->user_part.slen,
- acc->user_part.ptr, - acc->user_part.ptr,
+ acc->user_part.slen ? acc->user_part.ptr : "", + acc->user_part.slen ? acc->user_part.ptr : "",
@ -26,41 +26,43 @@
(int)acc->cfg.contact_uri_params.slen, (int)acc->cfg.contact_uri_params.slen,
- acc->cfg.contact_uri_params.ptr, - acc->cfg.contact_uri_params.ptr,
+ acc->cfg.contact_uri_params.slen ? acc->cfg.contact_uri_params.ptr : "", + acc->cfg.contact_uri_params.slen ? acc->cfg.contact_uri_params.ptr : "",
ob,
(int)acc->cfg.contact_params.slen, (int)acc->cfg.contact_params.slen,
- acc->cfg.contact_params.ptr); - acc->cfg.contact_params.ptr);
+ acc->cfg.contact_params.slen ? acc->cfg.contact_params.ptr : ""); + acc->cfg.contact_params.slen ? acc->cfg.contact_params.ptr : "");
if (len < 1) { if (len < 1) {
PJ_LOG(1,(THIS_FILE, "URI too long")); PJ_LOG(1,(THIS_FILE, "URI too long"));
pj_pool_release(pool); pj_pool_release(pool);
@@ -2233,22 +2233,22 @@ @@ -2467,23 +2467,23 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac
contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
"%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s", "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s%s>%.*s",
(int)acc->display.slen, (int)acc->display.slen,
- acc->display.ptr, - acc->display.ptr,
+ acc->display.slen ? acc->display.ptr : "", + acc->display.slen ? acc->display.ptr : "",
(acc->display.slen?" " : ""), (acc->display.slen?" " : ""),
(secure ? PJSUA_SECURE_SCHEME : "sip"), (secure ? PJSUA_SECURE_SCHEME : "sip"),
(int)acc->user_part.slen, (int)acc->user_part.slen,
- acc->user_part.ptr, - acc->user_part.ptr,
+ acc->user_part.slen ? acc->user_part.ptr : "", + acc->user_part.slen ? acc->user_part.ptr : "",
(acc->user_part.slen?"@":""), (acc->user_part.slen?"@":""),
beginquote, beginquote,
(int)local_addr.slen, (int)local_addr.slen,
- local_addr.ptr, - local_addr.ptr,
+ local_addr.slen ? local_addr.ptr : "", + local_addr.slen ? local_addr.ptr : "",
endquote, endquote,
local_port, local_port,
transport_param, transport_param,
(int)acc->cfg.contact_uri_params.slen, (int)acc->cfg.contact_uri_params.slen,
- acc->cfg.contact_uri_params.ptr, - acc->cfg.contact_uri_params.ptr,
+ acc->cfg.contact_uri_params.slen ? acc->cfg.contact_uri_params.ptr : "", + acc->cfg.contact_uri_params.slen ? acc->cfg.contact_uri_params.ptr : "",
(int)acc->cfg.contact_params.slen, ob,
- acc->cfg.contact_params.ptr); (int)acc->cfg.contact_params.slen,
+ acc->cfg.contact_params.slen ? acc->cfg.contact_params.ptr : ""); - acc->cfg.contact_params.ptr);
+ acc->cfg.contact_params.slen ? acc->cfg.contact_params.ptr : "");
return PJ_SUCCESS;
} return PJ_SUCCESS;
@@ -2390,22 +2390,22 @@ }
@@ -2625,22 +2625,22 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas
contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
"%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s", "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s",
(int)acc->display.slen, (int)acc->display.slen,

4
package/pjsip/patches/210-pjmedia_audiodev.patch
View File

@ -1,6 +1,6 @@
--- a/pjmedia/src/pjmedia-audiodev/audiodev.c --- a/pjmedia/src/pjmedia-audiodev/audiodev.c
+++ b/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c
@@ -98,6 +98,10 @@ @@ -98,6 +98,10 @@ pjmedia_aud_dev_factory* pjmedia_symb_md
pjmedia_aud_dev_factory* pjmedia_null_audio_factory(pj_pool_factory *pf); pjmedia_aud_dev_factory* pjmedia_null_audio_factory(pj_pool_factory *pf);
#endif #endif
@ -11,7 +11,7 @@
#define MAX_DRIVERS 16 #define MAX_DRIVERS 16
#define MAX_DEVS 64 #define MAX_DEVS 64
@@ -404,6 +408,9 @@ @@ -409,6 +413,9 @@ PJ_DEF(pj_status_t) pjmedia_aud_subsys_i
#if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO #if PJMEDIA_AUDIO_DEV_HAS_NULL_AUDIO
aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_null_audio_factory; aud_subsys.drv[aud_subsys.drv_cnt++].create = &pjmedia_null_audio_factory;
#endif #endif

1312
package/pjsip/src/pjmedia/src/pjmedia-audiodev/tapi_dev.c
View File

File diff suppressed because it is too large Load Diff