[#2605] Update to PJSIP 1.5.5

sflphone-common/libs/pjproject/build.symbian/pjsdp.mmp

@@ -24,7 +24,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 

sflphone-common/libs/pjproject/build.symbian/pjsip.mmp

@@ -27,7 +27,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 
@@ -51,6 +51,7 @@ SOURCE	sip_transport_wrap.cpp
 SOURCE	sip_transport_loop.c
 SOURCE	sip_transport_tcp.c
 SOURCE	sip_transport_udp.c
+SOURCE	sip_transport_tls.c
 SOURCE	sip_ua_layer.c
 SOURCE	sip_uri.c
 SOURCE	sip_util_wrap.cpp

sflphone-common/libs/pjproject/build.symbian/pjsip_simple.mmp

@@ -27,7 +27,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 
@@ -37,6 +37,7 @@ SOURCE	errno.c
 SOURCE	evsub.c
 SOURCE	evsub_msg.c
 SOURCE	iscomposing.c
+SOURCE	mwi.c
 SOURCE	pidf.c
 SOURCE	presence.c
 SOURCE	presence_body.c

sflphone-common/libs/pjproject/build.symbian/pjsip_ua.mmp

@@ -27,7 +27,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 

sflphone-common/libs/pjproject/build.symbian/pjstun_client.mmp

@@ -2,6 +2,8 @@ TARGET 		pjstun_client.exe
 TARGETTYPE 	exe
 UID		0x0 0xA000000A
 
+OPTION          ARMCC --gnu
+
 SOURCEPATH	..\pjnath\src\pjstun-client
 
 MACRO		PJ_M_I386=1

sflphone-common/libs/pjproject/build.symbian/pjsua_lib.mmp

@@ -27,7 +27,7 @@ MACRO		PJ_SYMBIAN=1
 
 // Must compile as C++, otherwise exception would not work
 OPTION          CW -lang c++
-OPTION          ARMCC --cpp
+OPTION          ARMCC --cpp --gnu
 OPTION          GCC     -x c++
 OPTION          GCCE    -x c++
 

sflphone-common/libs/pjproject/build.symbian/symbian_audio.mmp

@@ -25,6 +25,7 @@ SOURCEPATH	..\pjmedia\src\pjmedia
 
 OPTION		CW -lang c++
 OPTION		GCCE -O2 -fno-unit-at-a-time
+OPTION          ARMCC --gnu
 
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1

sflphone-common/libs/pjproject/build.symbian/symbian_ua.mmp

@@ -9,6 +9,8 @@ UID			0x0 0xA000000D
 
 SOURCEPATH		..\pjsip-apps\src\symbian_ua
 
+OPTION			ARMCC --gnu
+
 MACRO			PJ_M_I386=1
 MACRO			PJ_SYMBIAN=1
 
@@ -69,7 +71,7 @@ STATICLIBRARY		libresample.lib
 	STATICLIBRARY   eexe.lib ecrt0.lib
 #endif
 
-LIBRARY			esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 
+LIBRARY			esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib securesocket.lib 
 
 // The default 8KB seems to be insufficient with all bells and
 // whistles turned on

sflphone-common/libs/pjproject/build.symbian/symsndtest.mmp

@@ -5,6 +5,8 @@ TARGET 			symsndtest.exe
 TARGETTYPE 		exe
 UID			0x0 0xA000000E
 
+OPTION			ARMCC --gnu
+
 SOURCEPATH		..\pjsip-apps\src\symsndtest
 
 MACRO			PJ_M_I386=1

sflphone-common/libs/pjproject/build/os-auto.mak

-# build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-
-export OS_CFLAGS   := $(CC_DEF)PJ_AUTOCONF=1 -O2
-
-export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 
-
-export OS_LDFLAGS  :=  -lm -luuid -lnsl -lrt -lpthread  -lasound -lssl -lcrypto
-
-export OS_SOURCES  := 
-
-

sflphone-common/libs/pjproject/config.guess

-/usr/share/misc/config.guess
\ No newline at end of file

sflphone-common/libs/pjproject/config.sub

-/usr/share/misc/config.sub
\ No newline at end of file

sflphone-common/libs/pjproject/configure.ac

-dnl Dummy configure.ac for autotools
-
-AC_INIT
-LT_INIT
-AC_OUTPUT

sflphone-common/libs/pjproject/libpj-sfl.pc.in

-# Package Information for pkg-config
-
-prefix=@PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libpj-sfl
-Description: Multimedia communication library
-Version: 0.5.10.3
-Libs: -L${libdir} -lpjsua-sfl -lpjsip-sfl -lpjmedia-sfl -lpjsip-ua-sfl -lpjsip-simple-sfl -lpjsip-ua-sfl -lpjmedia-codec-sfl -lpjlib-util-sfl -lpj-sfl
-Cflags: -I${includedir}

sflphone-common/libs/pjproject/pjlib-util/build/Makefile

@@ -7,8 +7,8 @@ include $(PJDIR)/build/common.mak
 
 RULES_MAK := $(PJDIR)/build/rules.mak
 
-PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT)
-export PJLIB_UTIL_LIB:=../lib/libpjlib-util-sfl-$(TARGET_NAME)$(LIBEXT)
+PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
+export PJLIB_UTIL_LIB:=../lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
 
 ###############################################################################
 # Gather all flags.

sflphone-common/libs/pjproject/pjlib-util/build/os-auto.mak

-# pjlib-util/build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-export UTIL_TEST_OBJS = main.o
-

sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/srv_resolver.h

@@ -104,19 +104,7 @@ typedef enum pj_dns_srv_option
      * this option is not specified, the SRV resolver will query
      * the DNS A record for the target instead.
      */
-    PJ_DNS_SRV_RESOLVE_AAAA	= 4,
-
-    /** 
-     * Specify if the resolver should fallback to getaddrinfo 
-     * under IPV4 mode if DNS A fails after DNS SRV.
-     */
-     PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV4 = 8,
-    
-    /** 
-     * Specify if the resolver should fallback to getaddrinfo 
-     * under IPV6 mode if DNS A fails after DNS SRV.
-     */
-    PJ_DNS_SRV_FALLBACK_GETADDRINFO_IPV6 = 16,
+    PJ_DNS_SRV_RESOLVE_AAAA	= 4
 
 } pj_dns_srv_option;