diff options
Diffstat (limited to 'net-im')
34 files changed, 116 insertions, 640 deletions
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile index fa08796a2151..ecd92633eaad 100644 --- a/net-im/libjingle/Makefile +++ b/net-im/libjingle/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libjingle -PORTVERSION= 0.3.0 -PORTREVISION= 9 +PORTVERSION= 0.4.0 CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,10 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lioux@FreeBSD.org COMMENT= Google Talk's implementation of Jingle and Jingle-Audio -BROKEN= does not compile with new speex -DEPRECATED= Has been broken for more than 6 months -EXPIRATION_DATE=2008-09-19 - BUILD_DEPENDS= \ pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= \ @@ -27,13 +22,16 @@ LIB_DEPENDS= \ ortp.5:${PORTSDIR}/net/ortp \ expat.6:${PORTSDIR}/textproc/expat2 +CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \ + clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]* + USE_GNOME= glib20 USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 USE_DOS2UNIX= README USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= \ +CONFIGURE_ARGS= \ --with-ilbc=${LOCALBASE} \ --with-speex=${LOCALBASE} CONFIGURE_ENV= \ @@ -61,6 +59,8 @@ PORTDOCS= \ .endif PLIST_FILES+= \ + bin/login \ + bin/pcp \ bin/relayserver \ bin/stunserver \ @@ -77,9 +77,7 @@ post-configure: ${CONFIGURE_WRKSRC}/config.h # configure does not handle OSS support # force oss -# force ssl .for feature in \ - FEATURE_ENABLE_SSL \ HAVE_SYS_SOUNDCARD_H @${ECHO_CMD} \ '#define ${feature} 1' >> \ diff --git a/net-im/libjingle/distinfo b/net-im/libjingle/distinfo index 750732ec1ea9..5a1b7a3776d9 100644 --- a/net-im/libjingle/distinfo +++ b/net-im/libjingle/distinfo @@ -1,3 +1,3 @@ -MD5 (libjingle-0.3.0.tar.gz) = 668f5c36bef2b6ac7d5ebfb4e22f6f74 -SHA256 (libjingle-0.3.0.tar.gz) = 8d3e160a3c7f5aa5d8122115e97a67e0dfd68741f0f21dd84f77180a159b3377 -SIZE (libjingle-0.3.0.tar.gz) = 668268 +MD5 (libjingle-0.4.0.tar.gz) = 4fd81566ead30285e157a7fa16430b6e +SHA256 (libjingle-0.4.0.tar.gz) = 71f308b8c8ba696852d8706fe5a5149f53d3c1c55d505df1dcdac36a490cef47 +SIZE (libjingle-0.4.0.tar.gz) = 832774 diff --git a/net-im/libjingle/files/patch-configure b/net-im/libjingle/files/patch-configure deleted file mode 100644 index f0a47242227c..000000000000 --- a/net-im/libjingle/files/patch-configure +++ /dev/null @@ -1,65 +0,0 @@ ---- configure.orig Wed Feb 22 15:57:11 2006 -+++ configure Wed Feb 22 16:04:40 2006 -@@ -6353,7 +6353,7 @@ - fi - ;; - -- hpux*) -+ hpux* | freebsd*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in -@@ -6416,7 +6416,7 @@ - lt_prog_compiler_static='-Bstatic' - ;; - -- linux*) -+ linux* | freebsd*) - case $CC in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' -@@ -10793,7 +10793,7 @@ - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; -- hpux*) -+ hpux* | freebsd*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in -@@ -13230,7 +13230,7 @@ - fi - ;; - -- hpux*) -+ hpux* | freebsd*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in -@@ -13293,7 +13293,7 @@ - lt_prog_compiler_static_F77='-Bstatic' - ;; - -- linux*) -+ linux* | freebsd*) - case $CC in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' -@@ -15568,7 +15568,7 @@ - fi - ;; - -- hpux*) -+ hpux* | freebsd) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in -@@ -15631,7 +15631,7 @@ - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -- linux*) -+ linux* | freebsd*) - case $CC in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' diff --git a/net-im/libjingle/files/patch-talk__base__base64.h b/net-im/libjingle/files/patch-talk__base__base64.h new file mode 100644 index 000000000000..54c7730699f1 --- /dev/null +++ b/net-im/libjingle/files/patch-talk__base__base64.h @@ -0,0 +1,13 @@ +--- talk/base/base64.h.orig 2008-09-06 23:14:08.000000000 -0300 ++++ talk/base/base64.h 2008-09-06 23:14:50.000000000 -0300 +@@ -23,8 +23,8 @@ + static std::string decode(const std::string & data); + static std::string encodeFromArray(const char * data, size_t len); + private: +- static const std::string Base64::Base64Table; +- static const std::string::size_type Base64::DecodeTable[]; ++ static const std::string Base64Table; ++ static const std::string::size_type DecodeTable[]; + }; + + } // namespace talk_base diff --git a/net-im/libjingle/files/patch-talk__base__httpcommon.cc b/net-im/libjingle/files/patch-talk__base__httpcommon.cc new file mode 100644 index 000000000000..888e42291658 --- /dev/null +++ b/net-im/libjingle/files/patch-talk__base__httpcommon.cc @@ -0,0 +1,22 @@ +--- talk/base/httpcommon.cc.orig 2008-09-06 23:18:41.000000000 -0300 ++++ talk/base/httpcommon.cc 2008-09-06 23:31:38.000000000 -0300 +@@ -25,6 +25,10 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #include <time.h> + + #ifdef WIN32 +@@ -369,7 +373,7 @@ + } + gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; + } +-#ifdef OSX ++#if defined(OSX) || defined(__FreeBSD__) + tm *tm_for_timezone = localtime((time_t *)&gmt); + *seconds = gmt + tm_for_timezone->tm_gmtoff; + #else diff --git a/net-im/libjingle/files/patch-talk__base__ssladapter.cc b/net-im/libjingle/files/patch-talk__base__ssladapter.cc deleted file mode 100644 index f04150a5da25..000000000000 --- a/net-im/libjingle/files/patch-talk__base__ssladapter.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- talk/base/ssladapter.cc.orig Wed Feb 22 00:28:05 2006 -+++ talk/base/ssladapter.cc Wed Feb 22 00:29:01 2006 -@@ -99,7 +99,7 @@ - } - - static unsigned long id_function() { -- return static_cast<unsigned long>(THREAD_ID); -+ return reinterpret_cast<unsigned long>(THREAD_ID); - } - - struct CRYPTO_dynlock_value { diff --git a/net-im/libjingle/files/patch-talk__base__stringencode.cc b/net-im/libjingle/files/patch-talk__base__stringencode.cc new file mode 100644 index 000000000000..ae7b21f4ff55 --- /dev/null +++ b/net-im/libjingle/files/patch-talk__base__stringencode.cc @@ -0,0 +1,22 @@ +--- talk/base/stringencode.cc.orig 2008-09-06 23:16:12.000000000 -0300 ++++ talk/base/stringencode.cc 2008-09-06 23:25:50.000000000 -0300 +@@ -25,11 +25,19 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #ifdef WIN32 + #include <malloc.h> + #endif // WIN32 + #ifdef POSIX ++#ifdef __FreeBSD__ ++#include <stdlib.h> ++#else + #include <alloca.h> ++#endif + #define _alloca alloca + #endif // POSIX + diff --git a/net-im/libjingle/files/patch-talk__base__stringutils.h b/net-im/libjingle/files/patch-talk__base__stringutils.h new file mode 100644 index 000000000000..480969f957eb --- /dev/null +++ b/net-im/libjingle/files/patch-talk__base__stringutils.h @@ -0,0 +1,11 @@ +--- talk/base/stringutils.h.orig 2008-09-06 23:10:21.000000000 -0300 ++++ talk/base/stringutils.h 2008-09-06 23:13:17.000000000 -0300 +@@ -269,7 +269,7 @@ + template<> + struct Traits<char> { + typedef std::string string; +- inline static const char* Traits<char>::empty_str() { return ""; } ++ inline static const char* empty_str() { return ""; } + }; + + /////////////////////////////////////////////////////////////////////////////// diff --git a/net-im/libjingle/files/patch-talk__base__thread.cc b/net-im/libjingle/files/patch-talk__base__thread.cc index 02ec8efe2382..6e99cf5193a5 100644 --- a/net-im/libjingle/files/patch-talk__base__thread.cc +++ b/net-im/libjingle/files/patch-talk__base__thread.cc @@ -1,9 +1,9 @@ ---- talk/base/thread.cc.orig Tue May 2 11:43:09 2006 -+++ talk/base/thread.cc Tue May 2 11:43:21 2006 -@@ -113,6 +113,7 @@ - pthread_attr_t attr; - pthread_attr_init(&attr); - pthread_create(&thread_, &attr, PreLoop, this); +--- talk/base/thread.cc.orig 2008-09-06 23:02:42.000000000 -0300 ++++ talk/base/thread.cc 2008-09-06 23:03:04.000000000 -0300 +@@ -122,6 +122,7 @@ + pthread_attr_setschedparam(&attr, ¶m); + } + pthread_create(&thread_, &attr, PreRun, this); + pthread_attr_destroy(&attr); started_ = true; } diff --git a/net-im/libjingle/files/patch-talk__base__unixfilesystem.cc b/net-im/libjingle/files/patch-talk__base__unixfilesystem.cc new file mode 100644 index 000000000000..9f214f3e1c0d --- /dev/null +++ b/net-im/libjingle/files/patch-talk__base__unixfilesystem.cc @@ -0,0 +1,10 @@ +--- talk/base/unixfilesystem.cc.orig 2008-09-06 23:32:04.000000000 -0300 ++++ talk/base/unixfilesystem.cc 2008-09-06 23:33:03.000000000 -0300 +@@ -111,6 +111,7 @@ + if (create) + CreateFolder(pathname); + } ++ return true; + } + + std::string UnixFilesystem::TempFilenameI(const Pathname &dir, const std::string &prefix) { diff --git a/net-im/libjingle/files/patch-talk__p2p__base__sessionmanager.h b/net-im/libjingle/files/patch-talk__p2p__base__sessionmanager.h new file mode 100644 index 000000000000..5be0ac80a687 --- /dev/null +++ b/net-im/libjingle/files/patch-talk__p2p__base__sessionmanager.h @@ -0,0 +1,11 @@ +--- talk/p2p/base/sessionmanager.h.orig 2008-09-06 23:28:33.000000000 -0300 ++++ talk/p2p/base/sessionmanager.h 2008-09-06 23:28:56.000000000 -0300 +@@ -156,7 +156,7 @@ + + // Creates and returns an error message from the given components. The + // caller is responsible for deleting this. +- buzz::XmlElement* SessionManager::CreateErrorMessage( ++ buzz::XmlElement* CreateErrorMessage( + const buzz::XmlElement* stanza, + const buzz::QName& name, + const std::string& type, diff --git a/net-im/libjingle/files/patch-talk__session__phone__linphonemediaengine.cc b/net-im/libjingle/files/patch-talk__session__phone__linphonemediaengine.cc deleted file mode 100644 index 962789a9e838..000000000000 --- a/net-im/libjingle/files/patch-talk__session__phone__linphonemediaengine.cc +++ /dev/null @@ -1,52 +0,0 @@ ---- talk/session/phone/linphonemediaengine.cc.orig Wed Feb 22 16:32:44 2006 -+++ talk/session/phone/linphonemediaengine.cc Wed Feb 22 16:41:45 2006 -@@ -65,6 +65,7 @@ - - pthread_attr_init(&attr); - pthread_create(&thread_, &attr, &thread_function, this); -+ pthread_attr_destroy(&attr); - } - - LinphoneMediaChannel::~LinphoneMediaChannel() { -@@ -118,8 +119,8 @@ - mute_ = !send; - } - --float LinphoneMediaChannel::GetCurrentQuality() {} --int LinphoneMediaChannel::GetOutputLevel() {} -+float LinphoneMediaChannel::GetCurrentQuality() { return 0; } -+int LinphoneMediaChannel::GetOutputLevel() { return 0; } - - LinphoneMediaEngine::LinphoneMediaEngine() {} - LinphoneMediaEngine::~LinphoneMediaEngine() {} -@@ -139,7 +140,7 @@ - - #ifdef HAVE_SPEEX - ms_speex_codec_init(); -- rtp_profile_set_payload(&av_profile, 110, &speex_wb); -+ rtp_profile_set_payload(&av_profile, 110, &payload_type_speex_wb); - codecs_.push_back(Codec(110, "speex", 8)); - #endif - -@@ -149,7 +150,7 @@ - codecs_.push_back(Codec(102, "iLBC", 4)); - #endif - -- rtp_profile_set_payload(&av_profile, 0, &pcmu8000); -+ rtp_profile_set_payload(&av_profile, 0, &payload_type_pcmu8000); - codecs_.push_back(Codec(0, "PCMU", 2)); - - return true; -@@ -163,8 +164,8 @@ - return new LinphoneMediaChannel(); - } - --int LinphoneMediaEngine::SetAudioOptions(int options) {} --int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) {} -+int LinphoneMediaEngine::SetAudioOptions(int options) { return 0; } -+int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) { return 0; } - --float LinphoneMediaEngine::GetCurrentQuality() {} --int LinphoneMediaEngine::GetInputLevel() {} -+float LinphoneMediaEngine::GetCurrentQuality() { return 0; } -+int LinphoneMediaEngine::GetInputLevel() { return 0; } diff --git a/net-im/libjingle/files/patch-talk__session__phone__voicechannel.cc b/net-im/libjingle/files/patch-talk__session__phone__voicechannel.cc deleted file mode 100644 index 5532f4fbaa0d..000000000000 --- a/net-im/libjingle/files/patch-talk__session__phone__voicechannel.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- talk/session/phone/voicechannel.cc.orig Fri Mar 3 08:39:15 2006 -+++ talk/session/phone/voicechannel.cc Fri Mar 3 08:39:36 2006 -@@ -159,7 +159,7 @@ - channel_->OnPacketReceived(data, (int)len); - } - --void VoiceChannel::SendPacket(const void *data, unsigned int len) { -+void VoiceChannel::SendPacket(const void *data, size_t len) { - // SendPacket gets called from MediaEngine; send to socket - // MediaEngine will call us on a random thread. The Send operation on the socket is - // special in that it can handle this. diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__audiostream.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__audiostream.c deleted file mode 100644 index 9bda7b774498..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__audiostream.c +++ /dev/null @@ -1,69 +0,0 @@ ---- ./talk/third_party/mediastreamer/audiostream.c.orig Thu Mar 16 18:43:07 2006 -+++ ./talk/third_party/mediastreamer/audiostream.c Fri Apr 21 10:56:34 2006 -@@ -29,6 +29,8 @@ - - #define MAX_RTP_SIZE 1500 - -+#define rtp_session_max_buf_size_set(session, bufsize) (rtp_session_set_recv_buf_size(session, bufsize)) -+ - /* this code is not part of the library itself, it is part of the mediastream program */ - void audio_stream_free(AudioStream *stream) - { -@@ -118,7 +120,8 @@ - if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport); - rtp_session_set_scheduling_mode(rtpr,0); - rtp_session_set_blocking_mode(rtpr,0); -- rtp_session_set_payload_type(rtpr,payload); -+ rtp_session_set_send_payload_type(rtpr,payload); -+ rtp_session_set_recv_payload_type(rtpr,payload); - rtp_session_set_jitter_compensation(rtpr,jitt_comp); - rtp_session_enable_adaptive_jitter_compensation(rtpr,TRUE); - /*rtp_session_signal_connect(rtpr,"timestamp_jump",(RtpCallback)on_timestamp_jump,NULL);*/ -@@ -143,7 +146,8 @@ - rtp_session_set_remote_addr(rtps,remip,remport); - rtp_session_set_scheduling_mode(rtps,0); - rtp_session_set_blocking_mode(rtps,0); -- rtp_session_set_payload_type(rtps,payload); -+ rtp_session_set_send_payload_type(rtps,payload); -+ rtp_session_set_recv_payload_type(rtps,payload); - rtp_session_set_jitter_compensation(rtps,jitt_comp); - - rtpr=rtp_session_new(RTP_SESSION_RECVONLY); -@@ -156,9 +160,9 @@ - #endif - rtp_session_set_scheduling_mode(rtpr,0); - rtp_session_set_blocking_mode(rtpr,0); -- rtp_session_set_payload_type(rtpr,payload); -+ rtp_session_set_send_payload_type(rtpr,payload); -+ rtp_session_set_recv_payload_type(rtpr,payload); - rtp_session_set_jitter_compensation(rtpr,jitt_comp); -- rtp_session_signal_connect(rtpr,"telephone-event",(RtpCallback)on_dtmf_received,NULL); - rtp_session_signal_connect(rtpr,"timestamp_jump",(RtpCallback)on_timestamp_jump,NULL); - *recv=rtpr; - *send=rtps; -@@ -179,8 +183,6 @@ - rtp_session_signal_connect(rtpr,"telephone-event",(RtpCallback)on_dtmf_received,(gpointer)stream); - rtps=rtpr; - -- stream->recv_session = rtpr; -- stream->send_session = rtps; - stream->rtpsend=ms_rtp_send_new(); - ms_rtp_send_set_session(MS_RTP_SEND(stream->rtpsend),rtps); - stream->rtprecv=ms_rtp_recv_new(); -@@ -217,8 +219,8 @@ - ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FREQ,&pt->clock_rate); - ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_BITRATE,&pt->normal_bitrate); - -- ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP, (void*)pt->fmtp); -- ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->fmtp); -+ ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->send_fmtp); -+ ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->recv_fmtp); - /* create the synchronisation source */ - stream->timer=ms_timer_new(); - -@@ -340,4 +342,5 @@ - { - ms_rtp_send_dtmf(MS_RTP_SEND(stream->rtpsend), dtmf); - ms_oss_write_play_dtmf(MS_OSS_WRITE(stream->soundwrite),dtmf); -+ return 0; - } diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msGSMdecoder.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msGSMdecoder.h deleted file mode 100644 index cca3fe328899..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msGSMdecoder.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./talk/third_party/mediastreamer/msGSMdecoder.h.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msGSMdecoder.h Fri Apr 21 10:56:34 2006 -@@ -36,7 +36,7 @@ - /* the MSGSMDecoder derivates from MSFilter, so the MSFilter object MUST be the first of the MSGSMDecoder object - in order to the object mechanism to work*/ - MSFilter filter; -- MSFifo *f_inputs[MSGSMDECODER_MAX_INPUTS]; -+ MSQueue *q_inputs[MSGSMDECODER_MAX_INPUTS]; - MSFifo *f_outputs[MSGSMDECODER_MAX_INPUTS]; - gsm gsm_handle; - } MSGSMDecoder; diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msGSMencoder.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msGSMencoder.h deleted file mode 100644 index 2104dc63eeae..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msGSMencoder.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./talk/third_party/mediastreamer/msGSMencoder.h.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msGSMencoder.h Fri Apr 21 10:56:34 2006 -@@ -36,7 +36,7 @@ - in order to the object mechanism to work*/ - MSFilter filter; - MSFifo *f_inputs[MSGSMENCODER_MAX_INPUTS]; -- MSFifo *f_outputs[MSGSMENCODER_MAX_INPUTS]; -+ MSQueue *q_outputs[MSGSMENCODER_MAX_INPUTS]; - gsm gsm_handle; - } MSGSMEncoder; - diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msavencoder.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msavencoder.h deleted file mode 100644 index 40a7c8805b68..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msavencoder.h +++ /dev/null @@ -1,10 +0,0 @@ ---- talk/third_party/mediastreamer/msavencoder.h.orig Thu May 11 01:05:51 2006 -+++ talk/third_party/mediastreamer/msavencoder.h Thu May 11 01:06:18 2006 -@@ -44,6 +44,7 @@ - gint av_opened; - MSBuffer *comp_buf; - MSBuffer *yuv_buf; -+ MSMessage *outm; - }; - - typedef struct _MSAVEncoder MSAVEncoder; diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msbuffer.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msbuffer.c deleted file mode 100644 index 446f2125e034..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msbuffer.c +++ /dev/null @@ -1,42 +0,0 @@ ---- ./talk/third_party/mediastreamer/msbuffer.c.orig Wed May 10 23:56:49 2006 -+++ ./talk/third_party/mediastreamer/msbuffer.c Wed May 10 23:59:29 2006 -@@ -34,31 +34,28 @@ - /* allocate the data buffer: there is a lot of optmisation that can be done by using a pool of cached buffers*/ - buf->buffer=((char*)(buf))+sizeof(MSBuffer); /* to avoid to do two allocations, - buffer info and buffer are contigous.*/ -- buf->flags=MS_BUFFER_CONTIGUOUS; -+ buf->freefn=NULL; -+ buf->freearg=NULL; - return(buf); - } - --MSBuffer *ms_buffer_alloc(gint flags) -+MSBuffer *ms_buffer_new_with_buf(char *extbuf, int size,void (*freefn)(void *), void *freearg) - { - MSBuffer *buf; - buf=(MSBuffer*)g_malloc(sizeof(MSBuffer)); - buf->ref_count=0; -- buf->size=0; -- buf->buffer=NULL; -- buf->flags=0; -+ buf->size=size; -+ buf->buffer=extbuf; -+ buf->freefn=freefn; -+ buf->freearg=freearg; - return(buf); - } - - - void ms_buffer_destroy(MSBuffer *buf) - { -- if (buf->flags & MS_BUFFER_CONTIGUOUS){ -- g_free(buf); -- } -- else { -- g_free(buf->buffer); -+ if (buf->freefn!=NULL) buf->freefn(buf->freearg); - g_free(buf); -- } - } - - MSMessage *ms_message_alloc() diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msbuffer.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msbuffer.h deleted file mode 100644 index bf6c38230dd8..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msbuffer.h +++ /dev/null @@ -1,37 +0,0 @@ ---- ./talk/third_party/mediastreamer/msbuffer.h.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msbuffer.h Thu May 11 00:12:20 2006 -@@ -37,28 +37,28 @@ - { - gchar *buffer; - guint32 size; -- guint16 ref_count; -- guint16 flags; --#define MS_BUFFER_CONTIGUOUS (1) -+ gint ref_count; -+ void (*freefn)(void *); -+ void *freearg; - }MSBuffer; - - MSBuffer * ms_buffer_new(guint32 size); -+MSBuffer *ms_buffer_new_with_buf(char *extbuf, int size,void (*freefn)(void *), void *freearg); - void ms_buffer_destroy(MSBuffer *buf); - - struct _MSMessage - { - MSBuffer *buffer; /* points to a MSBuffer */ -- void *data; /*points to buffer->buffer */ -+ char *data; /*points to buffer->buffer */ - guint32 size; /* the size of the buffer to read in data. It may not be the - physical size (I mean buffer->buffer->size */ - struct _MSMessage *next; - struct _MSMessage *prev; /* MSMessage are queued into MSQueues */ -+ gboolean markbit; - }; - - typedef struct _MSMessage MSMessage; - -- --MSBuffer *ms_buffer_alloc(gint flags); - MSMessage *ms_message_new(gint size); - - #define ms_message_set_buf(m,b) do { (b)->ref_count++; (m)->buffer=(b); (m)->data=(b)->buffer; (m)->size=(b)->size; }while(0) diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mscodec.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mscodec.c deleted file mode 100644 index c843b127e34b..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mscodec.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ./talk/third_party/mediastreamer/mscodec.c.orig Thu May 11 00:01:12 2006 -+++ ./talk/third_party/mediastreamer/mscodec.c Thu May 11 00:01:45 2006 -@@ -21,6 +21,7 @@ - - #include "mscodec.h" - #include "msMUlawdec.h" -+#include "msAlawdec.h" - - #ifdef TRUESPEECH - extern MSCodecInfo TrueSpeechinfo; -@@ -43,6 +44,7 @@ - // ms_filter_register(MS_FILTER_INFO(&GSMinfo)); - // ms_filter_register(MS_FILTER_INFO(&LPC10info)); - ms_filter_register(MS_FILTER_INFO(&MULAWinfo)); -+ ms_filter_register(MS_FILTER_INFO(&ALAWinfo)); - #ifdef TRUESPEECH - ms_filter_register(MS_FILTER_INFO(&TrueSpeechinfo)); - #endif diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msfifo.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msfifo.c deleted file mode 100644 index 8b72fceecdbf..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msfifo.c +++ /dev/null @@ -1,37 +0,0 @@ ---- ./talk/third_party/mediastreamer/msfifo.c.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msfifo.c Thu May 11 00:03:06 2006 -@@ -54,7 +54,6 @@ - MSBuffer *buf; - gint saved_offset=MAX(r_gran+r_offset,w_offset); - gint fifo_size; -- gint tmp; - if (min_fifo_size==0) min_fifo_size=w_gran; - - /* we must allocate a fifo with a size multiple of min_fifo_size, -@@ -90,7 +89,7 @@ - if (bsize>fifo->readsize) - { - ms_trace("Not enough data: bsize=%i, readsize=%i",bsize,fifo->readsize); -- return (-ENODATA); -+ return -1; - } - - rnext=fifo->rd_ptr+bsize; -@@ -123,7 +122,7 @@ - /* fix readsize and writesize */ - fifo->readsize-=unwritten; - fifo->writesize+=unwritten; -- fifo->wr_ptr+=written; -+ fifo->wr_ptr=fifo->prev_wr_ptr+written; - } - - gint ms_fifo_get_write_ptr(MSFifo *fifo, gint bsize, void **ret_ptr) -@@ -137,7 +136,7 @@ - { - ms_trace("Not enough space: bsize=%i, writesize=%i",bsize,fifo->writesize); - *ret_ptr=NULL; -- return(-ENODATA); -+ return -1; - } - wnext=fifo->wr_ptr+bsize; - if (wnext<=fifo->w_end){ diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msqueue.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msqueue.c deleted file mode 100644 index 497262d9a19a..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msqueue.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./talk/third_party/mediastreamer/msqueue.c.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msqueue.c Fri Apr 21 10:56:34 2006 -@@ -53,4 +53,7 @@ - q->size++; - } - -+MSMessage *ms_queue_peek_last(MSQueue *q){ -+ return q->last; -+} - diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msqueue.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msqueue.h deleted file mode 100644 index 1e18950598e8..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msqueue.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./talk/third_party/mediastreamer/msqueue.h.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msqueue.h Fri Apr 21 10:56:34 2006 -@@ -41,6 +41,8 @@ - - void ms_queue_put(MSQueue *q, MSMessage *m); - -+MSMessage *ms_queue_peek_last(MSQueue *q); -+ - #define ms_queue_can_get(q) ( (q)->size!=0 ) - - #define ms_queue_destroy(q) g_free(q) diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtprecv.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtprecv.c deleted file mode 100644 index 99ecb6255c7f..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtprecv.c +++ /dev/null @@ -1,83 +0,0 @@ ---- ./talk/third_party/mediastreamer/msrtprecv.c.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msrtprecv.c Thu May 11 00:07:00 2006 -@@ -29,15 +29,10 @@ - if (mp->b_datap->ref_count!=1) return NULL; /* cannot handle properly non-unique buffers*/ - /* create a MSBuffer using the mblk_t buffer */ - msg=ms_message_alloc(); -- msbuf=ms_buffer_alloc(0); -- msbuf->buffer=mp->b_datap->db_base; -- msbuf->size=(char*)mp->b_datap->db_lim-(char*)mp->b_datap->db_base; -+ msbuf=ms_buffer_new_with_buf(mp->b_datap->db_base,mp->b_datap->db_lim-mp->b_datap->db_base,freemsg,mp); - ms_message_set_buf(msg,msbuf); - msg->size=mp->b_wptr-mp->b_rptr; - msg->data=mp->b_rptr; -- /* free the mblk_t */ -- g_free(mp->b_datap); -- g_free(mp); - return msg; - } - -@@ -70,6 +65,8 @@ - memset(r->q_outputs,0,sizeof(MSFifo*)*MSRTPRECV_MAX_OUTPUTS); - r->rtpsession=NULL; - r->stream_started=0; -+ r->ignore=FALSE; -+ r->payload_expected=0; - } - - void ms_rtp_recv_class_init(MSRtpRecvClass *klass) -@@ -120,7 +117,7 @@ - gint got=0; - /* we are connected with queues (surely for video)*/ - /* use the sync system time to compute a timestamp */ -- PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type); -+ PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->send_pt); - if (pt==NULL) { - ms_warning("ms_rtp_recv_process(): NULL RtpPayload- skipping."); - return; -@@ -134,10 +131,16 @@ - /*g_message("Got packet with timestamp %u",clock);*/ - got++; - r->stream_started=1; -- mdata=mp->b_cont; -- freeb(mp); -- msg=msgb_2_ms_message(mdata); -- ms_queue_put(qo,msg); -+ if (!r->ignore){ -+ gboolean markbit=((rtp_header_t*)mp->b_rptr)->markbit; -+ mdata=mp->b_cont; -+ freeb(mp); -+ msg=msgb_2_ms_message(mdata); -+ msg->markbit=markbit; -+ ms_queue_put(qo,msg); -+ }else{ -+ freemsg(mp); -+ } - } - } - } -@@ -147,10 +150,24 @@ - g_free(obj); - } - -+static void __payload_type_changed(RtpSession *session,MSRtpRecv *obj){ -+ int pt_num=rtp_session_get_recv_payload_type(session); -+ PayloadType *pt=rtp_profile_get_payload(rtp_session_get_profile(session),pt_num); -+ if (pt==NULL){ -+ /* sip phone should ignore payload types they don't understand */ -+ g_warning("Ignoring payload type %i",pt_num); -+ obj->ignore=TRUE; -+ }else{ -+ if (obj->ignore) g_warning("payload type is coming back to something known"); -+ obj->ignore=FALSE; -+ } -+} -+ - RtpSession * ms_rtp_recv_set_session(MSRtpRecv *obj,RtpSession *session) - { - RtpSession *old=obj->rtpsession; - obj->rtpsession=session; -+ rtp_session_signal_connect(session,"payload_type_changed",(RtpCallback)__payload_type_changed,(unsigned long)obj); - obj->prev_ts=0; - return old; - } diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtprecv.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtprecv.h deleted file mode 100644 index 7101798237f0..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtprecv.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ./talk/third_party/mediastreamer/msrtprecv.h.orig Thu Mar 16 18:43:05 2006 -+++ ./talk/third_party/mediastreamer/msrtprecv.h Fri Apr 21 10:56:34 2006 -@@ -34,7 +34,7 @@ - - #define MSRTPRECV_MAX_OUTPUTS 1 /* max output per filter*/ - --#define MSRTPRECV_DEF_GRAN 4096 /* the default granularity*/ -+#define MSRTPRECV_DEF_GRAN 320 /* the default granularity*/ - - struct _MSRtpRecv - { -@@ -47,6 +47,8 @@ - RtpSession *rtpsession; - guint32 prev_ts; - gint stream_started; -+ gint payload_expected; -+ gboolean ignore; - }; - - typedef struct _MSRtpRecv MSRtpRecv; diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtpsend.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtpsend.c deleted file mode 100644 index b3fcb7ccbe44..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtpsend.c +++ /dev/null @@ -1,23 +0,0 @@ ---- ./talk/third_party/mediastreamer/msrtpsend.c.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/msrtpsend.c Fri Apr 21 10:56:34 2006 -@@ -85,7 +85,7 @@ - { - guint32 clockts; - /* use the sync system time to compute a timestamp */ -- PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type); -+ PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->send_pt); - g_return_val_if_fail(pt!=NULL,0); - clockts=(guint32)(((double)synctime * (double)pt->clock_rate)/1000.0); - ms_trace("ms_rtp_send_process: sync->time=%i clock=%i",synctime,clockts); -@@ -138,8 +138,9 @@ - while ( (msg=ms_queue_get(qi))!=NULL){ - ts=get_new_timestamp(r,synctime); - if (!skip) { -- /*g_message("Sending packet with ts=%u",ts);*/ -- rtp_session_send_with_ts(r->rtpsession,msg->data,msg->size,ts); -+ mblk_t *packet=rtp_session_create_packet_with_data(r->rtpsession,msg->data,msg->size,NULL); -+ rtp_set_markbit(packet,msg->markbit); -+ rtp_session_sendm_with_ts(r->rtpsession,packet,ts); - - } - ms_message_destroy(msg); diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtpsend.h b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtpsend.h deleted file mode 100644 index 9481774c8de9..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msrtpsend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- talk/third_party/mediastreamer/msrtpsend.h.orig Fri May 5 23:32:24 2006 -+++ talk/third_party/mediastreamer/msrtpsend.h Fri May 5 23:32:42 2006 -@@ -34,7 +34,7 @@ - - #define MSRTPSEND_MAX_INPUTS 1 /* max input per filter*/ - --#define MSRTPSEND_DEF_GRAN 4096/* the default granularity*/ -+#define MSRTPSEND_DEF_GRAN 160 /* the default granularity*/ - - struct _MSRtpSend - { diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msspeexdec.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msspeexdec.c deleted file mode 100644 index d3956ac2b350..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msspeexdec.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./talk/third_party/mediastreamer/msspeexdec.c.orig Thu Mar 16 18:43:07 2006 -+++ ./talk/third_party/mediastreamer/msspeexdec.c Fri Apr 21 10:56:34 2006 -@@ -171,6 +171,7 @@ - void ms_speex_dec_uninit_core(MSSpeexDec *obj) - { - speex_decoder_destroy(obj->speex_state); -+ speex_bits_destroy(&obj->bits); - obj->initialized=0; - } - diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msspeexenc.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msspeexenc.c deleted file mode 100644 index fab81bd3dae8..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__msspeexenc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./talk/third_party/mediastreamer/msspeexenc.c.orig Thu Mar 16 18:43:07 2006 -+++ ./talk/third_party/mediastreamer/msspeexenc.c Fri Apr 21 10:56:34 2006 -@@ -157,6 +157,7 @@ - { - if (obj->initialized){ - speex_encoder_destroy(obj->speex_state); -+ speex_bits_destroy(&obj->bits); - obj->initialized=0; - } - } diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mssync.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mssync.c deleted file mode 100644 index 93abf021f9a2..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mssync.c +++ /dev/null @@ -1,9 +0,0 @@ ---- ./talk/third_party/mediastreamer/mssync.c.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/mssync.c Fri Apr 21 10:56:34 2006 -@@ -189,5 +189,6 @@ - g_mutex_free(sync->lock); - g_cond_free(sync->thread_cond); - g_cond_free(sync->stop_cond); -+ return 0; - } - diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mstimer.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mstimer.c deleted file mode 100644 index 5038dbb1d0ee..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__mstimer.c +++ /dev/null @@ -1,39 +0,0 @@ ---- ./talk/third_party/mediastreamer/mstimer.c.orig Thu Mar 16 18:43:06 2006 -+++ ./talk/third_party/mediastreamer/mstimer.c Wed May 10 23:45:11 2006 -@@ -33,8 +33,8 @@ - ms_sync_init(MS_SYNC(sync)); - MS_SYNC(sync)->attached_filters=sync->filters; - memset(sync->filters,0,MSTIMER_MAX_FILTERS*sizeof(MSFilter*)); -- MS_SYNC(sync)->samples_per_tick=160; -- ms_timer_set_interval(sync,20); -+ MS_SYNC(sync)->samples_per_tick=80; -+ ms_timer_set_interval(sync,10); - sync->state=MS_TIMER_STOPPED; - } - -@@ -66,6 +66,8 @@ - else { - gint32 diff,time; - struct timeval tv,cur; -+ -+ timer->sync.time+=timer->milisec; - - gettimeofday(&cur,NULL); - time=((cur.tv_usec-timer->orig.tv_usec)/1000 ) + ((cur.tv_sec-timer->orig.tv_sec)*1000 ); -@@ -74,14 +76,13 @@ - } - while((diff = timer->sync.time-time) > 0) - { -- tv.tv_sec = diff/1000; -- tv.tv_usec = (diff%1000)*1000; -+ tv.tv_sec = timer->milisec/1000; -+ tv.tv_usec = (timer->milisec%1000)*1000; - select(0,NULL,NULL,NULL,&tv); - gettimeofday(&cur,NULL); - time=((cur.tv_usec-timer->orig.tv_usec)/1000 ) + ((cur.tv_sec-timer->orig.tv_sec)*1000 ); - } - } -- timer->sync.time+=timer->milisec; - return; - } - diff --git a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__osscard.c b/net-im/libjingle/files/patch-talk__third_party__mediastreamer__osscard.c deleted file mode 100644 index ef07e90c732e..000000000000 --- a/net-im/libjingle/files/patch-talk__third_party__mediastreamer__osscard.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ./talk/third_party/mediastreamer/osscard.c.orig Fri Apr 21 11:06:47 2006 -+++ ./talk/third_party/mediastreamer/osscard.c Fri Apr 21 11:07:03 2006 -@@ -342,7 +342,7 @@ - { - int p=0,mix_fd; - int osscmd; -- g_return_if_fail(obj->mixdev_name!=NULL); -+ g_return_val_if_fail(obj->mixdev_name!=NULL,-1); - #ifdef HAVE_SYS_SOUNDCARD_H - switch(way){ - case SND_CARD_LEVEL_GENERAL: diff --git a/net-im/libjingle/files/patch-talk__xmpp__saslplainmechanism.h b/net-im/libjingle/files/patch-talk__xmpp__saslplainmechanism.h deleted file mode 100644 index b6892aa4e16c..000000000000 --- a/net-im/libjingle/files/patch-talk__xmpp__saslplainmechanism.h +++ /dev/null @@ -1,11 +0,0 @@ ---- talk/xmpp/saslplainmechanism.h.orig Wed May 10 07:43:35 2006 -+++ talk/xmpp/saslplainmechanism.h Wed May 10 07:44:01 2006 -@@ -48,7 +48,7 @@ - - FormatXmppPassword credential; - credential.Append("\0", 1); -- credential.Append(user_jid_.Str()); -+ credential.Append(user_jid_.node()); - credential.Append("\0", 1); - credential.Append(&password_); - el->AddText(Base64EncodeFromArray(credential.GetData(), credential.GetLength())); diff --git a/net-im/libjingle/files/patch-talk__xmpp_xmppclient.h b/net-im/libjingle/files/patch-talk__xmpp_xmppclient.h new file mode 100644 index 000000000000..95e317c567fe --- /dev/null +++ b/net-im/libjingle/files/patch-talk__xmpp_xmppclient.h @@ -0,0 +1,11 @@ +--- talk/xmpp/xmppclient.h.orig 2008-09-06 23:26:42.000000000 -0300 ++++ talk/xmpp/xmppclient.h 2008-09-06 23:27:04.000000000 -0300 +@@ -138,7 +138,7 @@ + } + } + +- std::string XmppClient::GetStateName(int state) const { ++ std::string GetStateName(int state) const { + switch (state) { + case STATE_PRE_XMPP_LOGIN: return "PRE_XMPP_LOGIN"; + case STATE_START_XMPP_LOGIN: return "START_XMPP_LOGIN"; |