[libjingle/f14/master] bring the patches over
Tom Callaway
spot at fedoraproject.org
Thu Jan 13 19:18:38 UTC 2011
commit 9cc576fc6d1b36954cfc3523f7779ce26ac73322
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Thu Jan 13 14:19:20 2011 -0500
bring the patches over
libjingle-0.5.1-C-linkage-fix.patch | 14 +
libjingle-0.5.1-NULL-fix.patch | 11 +
libjingle-0.5.1-build-sanity.patch | 625 +++++++++++++++++++++++++++
libjingle-0.5.1-devicemanager-alsafix.patch | 30 ++
libjingle-0.5.1-statfix.patch | 22 +
libjingle-0.5.1-system-expat.patch | 60 +++
libjingle-0.5.1-system-srtp.patch | 12 +
libjingle-0.5.1-timefix.patch | 19 +
libjingle-0.5.1-uint32-fix.patch | 12 +
libjingle-0.5.1-unixfilesystemfix.patch | 22 +
libjingle-0.5.1-v4llookup-fix.patch | 21 +
11 files changed, 848 insertions(+), 0 deletions(-)
---
diff --git a/libjingle-0.5.1-C-linkage-fix.patch b/libjingle-0.5.1-C-linkage-fix.patch
new file mode 100644
index 0000000..cc458c9
--- /dev/null
+++ b/libjingle-0.5.1-C-linkage-fix.patch
@@ -0,0 +1,14 @@
+diff -up libjingle-0.5.1/talk/base/basictypes.h.linkage libjingle-0.5.1/talk/base/basictypes.h
+--- libjingle-0.5.1/talk/base/basictypes.h.linkage 2010-11-18 16:20:19.365761996 -0500
++++ libjingle-0.5.1/talk/base/basictypes.h 2010-11-18 16:20:28.934762001 -0500
+@@ -80,8 +80,10 @@ typedef int socklen_t;
+ #endif
+
+ namespace talk_base {
++extern "C++" {
+ template<class T> inline T _min(T a, T b) { return (a > b) ? b : a; }
+ template<class T> inline T _max(T a, T b) { return (a < b) ? b : a; }
++}
+
+ // For wait functions that take a number of milliseconds, kForever indicates
+ // unlimited time.
diff --git a/libjingle-0.5.1-NULL-fix.patch b/libjingle-0.5.1-NULL-fix.patch
new file mode 100644
index 0000000..005cb18
--- /dev/null
+++ b/libjingle-0.5.1-NULL-fix.patch
@@ -0,0 +1,11 @@
+diff -up libjingle-0.5.1/talk/base/event.cc.NULL libjingle-0.5.1/talk/base/event.cc
+--- libjingle-0.5.1/talk/base/event.cc.NULL 2010-11-18 16:02:08.333762000 -0500
++++ libjingle-0.5.1/talk/base/event.cc 2010-11-18 16:02:17.010762001 -0500
+@@ -26,6 +26,7 @@
+ */
+
+ #include "talk/base/event.h"
++#include <cstdlib>
+
+ #if defined(WIN32)
+ #include <windows.h>
diff --git a/libjingle-0.5.1-build-sanity.patch b/libjingle-0.5.1-build-sanity.patch
new file mode 100644
index 0000000..1ed2b75
--- /dev/null
+++ b/libjingle-0.5.1-build-sanity.patch
@@ -0,0 +1,625 @@
+diff -up libjingle-0.5.1/configure.ac.SANITY libjingle-0.5.1/configure.ac
+--- libjingle-0.5.1/configure.ac.SANITY 2010-11-19 15:06:35.529492155 -0500
++++ libjingle-0.5.1/configure.ac 2010-11-19 15:36:17.297431699 -0500
+@@ -0,0 +1,86 @@
++AC_INIT([libjingle], [0.5.1], [google-talk-open at googlegroups.com])
++AC_CANONICAL_SYSTEM
++AM_CONFIG_HEADER(config.h)
++AM_INIT_AUTOMAKE([dist-zip])
++AC_PROG_CC
++AC_PROG_CXX
++AM_PROG_LIBTOOL
++LIBTOOL="$LIBTOOL --silent"
++AC_PROG_INSTALL
++AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build])
++AC_DEFINE(PRODUCTION, 1, [Build as a production build])
++AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX])
++AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail])
++AC_DEFINE(LOGGING, 1, [Logging])
++
++LIBJINGLE_MAJORMINOR=0.5
++AC_SUBST(LIBJINGLE_MAJORMINOR)
++
++LIBJINGLE_LIBRARY_VERSION=1:0:0
++AC_SUBST(LIBJINGLE_LIBRARY_VERSION)
++
++HAVE_EXPAT=no
++AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes")
++if test "x$HAVE_EXPAT" = xyes ; then
++ EXPAT_LIBS="-lexpat"
++ AC_SUBST(EXPAT_LIBS)
++else
++ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/])
++fi
++
++if test `uname -s` = Linux ; then
++ AC_DEFINE(LINUX, 1, [Building on Linux])
++ HAVE_ALSA=no
++ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes")
++ if test "x$HAVE_ALSA" = xyes ; then
++ ALSA_LIBS="-lasound"
++ AC_SUBST(ALSA_LIBS)
++ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA])
++ else
++ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/])
++ fi
++
++ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no)
++ if test x$HAVE_OPENSSL_SSL_H = xyes; then
++ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h])
++ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no)
++ AC_SUBST(OPENSSL_CFLAGS)
++ AC_SUBST(OPENSSL_LIBS)
++ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL])
++ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled])
++ CPPFLAGS+="$OPENSSL_CFLAGS"
++ LDFLAGS+="$OPENSSL_LIBS"
++ else
++ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h])
++ fi
++fi
++
++PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no)
++if test x$enable_srtp = xno ; then
++ HAVE_SRTP=no
++else
++ AC_SUBST(LIBSRTP_CFLAGS)
++ AC_SUBST(LIBSRTP_LIBS)
++ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt])
++fi
++
++AC_OUTPUT([Makefile
++ talk/Makefile
++ talk/base/Makefile
++ talk/examples/Makefile
++ talk/examples/login/Makefile
++ talk/examples/call/Makefile
++ talk/p2p/Makefile
++ talk/p2p/base/Makefile
++ talk/p2p/client/Makefile
++ talk/session/Makefile
++ talk/session/tunnel/Makefile
++ talk/session/phone/Makefile
++ talk/xmllite/Makefile
++ talk/xmpp/Makefile
++ pkgconfig/Makefile
++ pkgconfig/jinglebase.pc
++ pkgconfig/jinglep2p.pc
++ pkgconfig/jinglesessiontunnel.pc
++ pkgconfig/jinglesessionphone.pc
++ ])
+diff -up libjingle-0.5.1/Makefile.am.SANITY libjingle-0.5.1/Makefile.am
+--- libjingle-0.5.1/Makefile.am.SANITY 2010-11-19 15:06:35.529492155 -0500
++++ libjingle-0.5.1/Makefile.am 2010-11-19 15:06:35.529492155 -0500
+@@ -0,0 +1,4 @@
++SUBDIRS=talk pkgconfig
++
++configdir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk
++config_HEADERS = config.h
+diff -up libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglebase.pc.in
+--- libjingle-0.5.1/pkgconfig/jinglebase.pc.in.SANITY 2010-11-19 15:06:35.529492155 -0500
++++ libjingle-0.5.1/pkgconfig/jinglebase.pc.in 2010-11-19 15:06:35.529492155 -0500
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglebase
++Description: Jingle Base Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lpthread -ljinglebase
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglep2p.pc.in
+--- libjingle-0.5.1/pkgconfig/jinglep2p.pc.in.SANITY 2010-11-19 15:06:35.529492155 -0500
++++ libjingle-0.5.1/pkgconfig/jinglep2p.pc.in 2010-11-19 15:06:35.529492155 -0500
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglep2p
++Description: Jingle P2P Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in
+--- libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in.SANITY 2010-11-19 15:06:35.530514466 -0500
++++ libjingle-0.5.1/pkgconfig/jinglesessionphone.pc.in 2010-11-19 15:06:35.530514466 -0500
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglesessionphone
++Description: Jingle Session Phone Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in
+--- libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2010-11-19 15:06:35.530514466 -0500
++++ libjingle-0.5.1/pkgconfig/jinglesessiontunnel.pc.in 2010-11-19 15:06:35.530514466 -0500
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglesessiontunnel
++Description: Jingle Session Tunnel Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lpthread -ljinglesessiontunnel
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.5.1/pkgconfig/Makefile.am.SANITY libjingle-0.5.1/pkgconfig/Makefile.am
+--- libjingle-0.5.1/pkgconfig/Makefile.am.SANITY 2010-11-19 15:06:35.530514466 -0500
++++ libjingle-0.5.1/pkgconfig/Makefile.am 2010-11-19 15:06:35.530514466 -0500
+@@ -0,0 +1,20 @@
++### all of the standard pc files we need to generate
++pcfiles = jinglebase- at LIBJINGLE_MAJORMINOR@.pc jinglep2p- at LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel- at LIBJINGLE_MAJORMINOR@.pc jinglesessionphone- at LIBJINGLE_MAJORMINOR@.pc
++
++all-local: $(pcfiles)
++
++### how to generate pc files
++%- at LIBJINGLE_MAJORMINOR@.pc: %.pc
++ cp $< $@
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = $(pcfiles)
++
++EXTRA_DIST = \
++ jinglebase.pc.in \
++ jinglep2p.pc.in \
++ jinglesessionphone.pc.in \
++ jinglesessiontunnel.pc.in
++
++CLEANFILES = $(pcfiles)
++
+diff -up libjingle-0.5.1/talk/base/Makefile.am.SANITY libjingle-0.5.1/talk/base/Makefile.am
+--- libjingle-0.5.1/talk/base/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500
++++ libjingle-0.5.1/talk/base/Makefile.am 2010-11-19 15:06:35.531284893 -0500
+@@ -0,0 +1,135 @@
++lib_LTLIBRARIES = libjinglebase.la
++
++libjinglebase_la_SOURCES = asyncfile.cc \
++ asynchttprequest.cc \
++ asyncpacketsocket.cc \
++ asyncsocket.cc \
++ asynctcpsocket.cc \
++ asyncudpsocket.cc \
++ autodetectproxy.cc \
++ base64.cc \
++ bytebuffer.cc \
++ checks.cc \
++ common.cc \
++ diskcache.cc \
++ event.cc \
++ fileutils.cc \
++ firewallsocketserver.cc \
++ flags.cc \
++ helpers.cc \
++ host.cc \
++ httpbase.cc \
++ httpclient.cc \
++ httpcommon.cc \
++ httprequest.cc \
++ linux.cc \
++ logging.cc \
++ md5c.c \
++ messagehandler.cc \
++ messagequeue.cc \
++ nethelpers.cc \
++ network.cc \
++ openssladapter.cc \
++ opensslidentity.cc \
++ opensslstreamadapter.cc \
++ pathutils.cc \
++ physicalsocketserver.cc \
++ proxydetect.cc \
++ proxyinfo.cc \
++ signalthread.cc \
++ socketadapters.cc \
++ socketaddress.cc \
++ socketaddresspair.cc \
++ socketpool.cc \
++ socketstream.cc \
++ ssladapter.cc \
++ sslidentity.cc \
++ sslsocketfactory.cc \
++ sslstreamadapter.cc \
++ stream.cc \
++ stringdigest.cc \
++ stringencode.cc \
++ stringutils.cc \
++ task.cc \
++ taskparent.cc \
++ taskrunner.cc \
++ thread.cc \
++ time.cc \
++ unixfilesystem.cc \
++ urlencode.cc
++
++libjinglebase_la_LIBADD = -lrt
++
++libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++libjinglebase_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/base
++
++libjinglebase_include_HEADERS = asyncfile.h \
++ asynchttprequest.h \
++ asyncpacketsocket.h \
++ asyncsocket.h \
++ asynctcpsocket.h \
++ asyncudpsocket.h \
++ autodetectproxy.h \
++ base64.h \
++ basicdefs.h \
++ basictypes.h \
++ bytebuffer.h \
++ byteorder.h \
++ checks.h \
++ common.h \
++ constructormagic.h \
++ criticalsection.h \
++ cryptstring.h \
++ diskcache.h \
++ event.h \
++ fileutils.h \
++ firewallsocketserver.h \
++ flags.h \
++ helpers.h \
++ host.h \
++ httpbase.h \
++ httpclient.h \
++ httpcommon-inl.h \
++ httpcommon.h \
++ httprequest.h \
++ linked_ptr.h \
++ linux.h \
++ logging.h \
++ md5.h \
++ messagehandler.h \
++ messagequeue.h \
++ nethelpers.h \
++ network.h \
++ pathutils.h \
++ physicalsocketserver.h \
++ proxydetect.h \
++ proxyinfo.h \
++ scoped_ptr.h \
++ sec_buffer.h \
++ signalthread.h \
++ sigslot.h \
++ sigslotrepeater.h \
++ socket.h \
++ socketadapters.h \
++ socketaddress.h \
++ socketfactory.h \
++ socketpool.h \
++ socketserver.h \
++ socketstream.h \
++ ssladapter.h \
++ sslsocketfactory.h \
++ sslstreamadapter.h \
++ stream.h \
++ stringdigest.h \
++ stringencode.h \
++ stringutils.h \
++ task.h \
++ taskparent.h \
++ taskrunner.h \
++ thread.h \
++ time.h \
++ unixfilesystem.h \
++ urlencode.h
++
++AM_CXXFLAGS = -DPOSIX
+diff -up libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY libjingle-0.5.1/talk/examples/call/Makefile.am
+--- libjingle-0.5.1/talk/examples/call/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500
++++ libjingle-0.5.1/talk/examples/call/Makefile.am 2010-11-19 15:06:35.531284893 -0500
+@@ -0,0 +1,23 @@
++bin_PROGRAMS = call
++call_CXXFLAGS = $(AM_CXXFLAGS)
++call_SOURCES = call_main.cc \
++ callclient.cc \
++ console.cc \
++ discoitemsquerytask.cc \
++ friendinvitesendtask.cc \
++ mucinviterecvtask.cc \
++ mucinvitesendtask.cc \
++ presenceouttask.cc \
++ presencepushtask.cc \
++ voicemailjidrequester.cc
++noinst_HEADERS = callclient.h console.h
++call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \
++ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \
++ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \
++ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \
++ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \
++ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
++ $(top_srcdir)/talk/base/libjinglebase.la \
++ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread
++AM_CPPFLAGS = -DPOSIX
++
+diff -up libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY libjingle-0.5.1/talk/examples/login/Makefile.am
+--- libjingle-0.5.1/talk/examples/login/Makefile.am.SANITY 2010-11-19 15:06:35.531284893 -0500
++++ libjingle-0.5.1/talk/examples/login/Makefile.am 2010-11-19 15:06:35.531284893 -0500
+@@ -0,0 +1,24 @@
++noinst_LTLIBRARIES= libxmpphelp.la
++libxmpphelp_la_SOURCES = xmppsocket.cc \
++ xmppauth.cc \
++ xmpppump.cc
++
++noinst_HEADERS = xmppauth.h \
++ xmpppump.h \
++ xmppsocket.h \
++ xmppthread.h \
++ jingleinfotask.h \
++ presenceouttask.h \
++ presencepushtask.h \
++ status.h
++
++bin_PROGRAMS = login
++login_CXXFLAGS = $(AM_CXXFLAGS)
++login_SOURCES = login_main.cc xmppthread.cc
++login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \
++ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
++ $(top_srcdir)/talk/base/libjinglebase.la \
++ $(top_srcdir)/talk/examples/login/libxmpphelp.la \
++ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread
++AM_CPPFLAGS = -DPOSIX
++
+diff -up libjingle-0.5.1/talk/examples/Makefile.am.SANITY libjingle-0.5.1/talk/examples/Makefile.am
+--- libjingle-0.5.1/talk/examples/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500
++++ libjingle-0.5.1/talk/examples/Makefile.am 2010-11-19 15:06:35.532294141 -0500
+@@ -0,0 +1 @@
++SUBDIRS=login call
+diff -up libjingle-0.5.1/talk/Makefile.am.SANITY libjingle-0.5.1/talk/Makefile.am
+--- libjingle-0.5.1/talk/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500
++++ libjingle-0.5.1/talk/Makefile.am 2010-11-19 15:06:35.532294141 -0500
+@@ -0,0 +1 @@
++SUBDIRS=base xmllite xmpp p2p session
+diff -up libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/base/Makefile.am
+--- libjingle-0.5.1/talk/p2p/base/Makefile.am.SANITY 2010-11-19 15:06:35.532294141 -0500
++++ libjingle-0.5.1/talk/p2p/base/Makefile.am 2010-11-19 15:06:35.532294141 -0500
+@@ -0,0 +1,74 @@
++lib_LTLIBRARIES = libjinglep2pbase.la
++
++libjinglep2pbase_la_SOURCES = stun.cc \
++ port.cc \
++ udpport.cc \
++ tcpport.cc \
++ stunport.cc \
++ relayport.cc \
++ relayserver.cc \
++ stunrequest.cc \
++ stunserver.cc \
++ sessionmanager.cc \
++ sessionmessages.cc \
++ session.cc \
++ sessiondescription.cc \
++ transport.cc \
++ transportchannel.cc \
++ transportchannelproxy.cc \
++ p2ptransport.cc \
++ p2ptransportchannel.cc \
++ rawtransport.cc \
++ rawtransportchannel.cc \
++ constants.cc \
++ pseudotcp.cc \
++ parsing.cc
++
++libjinglep2pbase_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/p2p/base
++libjinglep2pbase_include_HEADERS = candidate.h \
++ portallocator.h \
++ relayport.h \
++ session.h \
++ stunport.h \
++ tcpport.h \
++ port.h \
++ sessionid.h \
++ stunrequest.h \
++ udpport.h \
++ pseudotcp.h \
++ sessiondescription.h \
++ sessionmanager.h \
++ stun.h \
++ relayserver.h \
++ stunserver.h \
++ sessionclient.h \
++ transport.h \
++ transportchannel.h \
++ transportchannelproxy.h \
++ transportchannelimpl.h \
++ p2ptransport.h \
++ p2ptransportchannel.h \
++ rawtransport.h \
++ rawtransportchannel.h \
++ constants.h \
++ common.h \
++ parsing.h \
++ sessionmessages.h
++
++libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
++ $(top_srcdir)/talk/xmpp/libjinglexmpp.la
++
++AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g
++
++P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread
++XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS)
++
++bin_PROGRAMS = relayserver stunserver
++relayserver_SOURCES = relayserver.cc relayserver_main.cc
++relayserver_LDADD = $(P2PLIBS)
++relayserver_CPPFLAGS = $(AM_CPPFLAGS)
++
++stunserver_SOURCES = stunserver.cc stunserver_main.cc
++stunserver_LDADD = $(P2PLIBS)
++stunserver_CPPFLAGS = $(AM_CPPFLAGS)
+diff -up libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/client/Makefile.am
+--- libjingle-0.5.1/talk/p2p/client/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500
++++ libjingle-0.5.1/talk/p2p/client/Makefile.am 2010-11-19 15:06:35.533290617 -0500
+@@ -0,0 +1,18 @@
++lib_LTLIBRARIES = libjinglep2pclient.la
++
++libjinglep2pclient_la_SOURCES = basicportallocator.cc \
++ httpportallocator.cc \
++ socketmonitor.cc
++
++libjinglep2pclient_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/p2p/client
++
++libjinglep2pclient_include_HEADERS = basicportallocator.h \
++ socketmonitor.h \
++ sessionmanagertask.h \
++ sessionsendtask.h \
++ httpportallocator.h
++
++libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD
++
+diff -up libjingle-0.5.1/talk/p2p/Makefile.am.SANITY libjingle-0.5.1/talk/p2p/Makefile.am
+--- libjingle-0.5.1/talk/p2p/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500
++++ libjingle-0.5.1/talk/p2p/Makefile.am 2010-11-19 15:06:35.533290617 -0500
+@@ -0,0 +1 @@
++SUBDIRS=base client
+diff -up libjingle-0.5.1/talk/session/Makefile.am.SANITY libjingle-0.5.1/talk/session/Makefile.am
+--- libjingle-0.5.1/talk/session/Makefile.am.SANITY 2010-11-19 15:06:35.533290617 -0500
++++ libjingle-0.5.1/talk/session/Makefile.am 2010-11-19 15:06:35.533290617 -0500
+@@ -0,0 +1 @@
++SUBDIRS = tunnel phone
+diff -up libjingle-0.5.1/talk/session/phone/Makefile.am.SANITY libjingle-0.5.1/talk/session/phone/Makefile.am
+--- libjingle-0.5.1/talk/session/phone/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500
++++ libjingle-0.5.1/talk/session/phone/Makefile.am 2010-11-19 15:06:35.534284310 -0500
+@@ -0,0 +1,37 @@
++lib_LTLIBRARIES = libjinglesessionphone.la
++
++libjinglesessionphone_la_SOURCES = audiomonitor.cc \
++ channelmanager.cc \
++ call.cc \
++ channel.cc \
++ codec.cc \
++ devicemanager.cc \
++ filemediaengine.cc \
++ mediaengine.cc \
++ mediamonitor.cc \
++ mediasessionclient.cc \
++ rtpdump.cc \
++ soundclip.cc \
++ srtpfilter.cc \
++ v4llookup.cc
++
++libjinglesessionphone_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/session/phone
++libjinglesessionphone_include_HEADERS = audiomonitor.h \
++ channelmanager.h \
++ mediaengine.h \
++ voicechannel.h \
++ call.h \
++ mediachannel.h \
++ codec.h \
++ channel.h \
++ filemediaengine.h \
++ mediasessionclient.h \
++ rtpdump.h \
++ srtpfilter.h \
++ videocommon.h
++
++libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS)
++
++AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS)
+diff -up libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY libjingle-0.5.1/talk/session/tunnel/Makefile.am
+--- libjingle-0.5.1/talk/session/tunnel/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500
++++ libjingle-0.5.1/talk/session/tunnel/Makefile.am 2010-11-19 15:06:35.534284310 -0500
+@@ -0,0 +1,16 @@
++lib_LTLIBRARIES = libjinglesessiontunnel.la
++
++libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \
++ securetunnelsessionclient.cc \
++ pseudotcpchannel.cc
++
++libjinglesessiontunnel_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/session/tunnel
++
++libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \
++ pseudotcpchannel.h \
++ securetunnelsessionclient.h
++
++libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CXXFLAGS = -DPOSIX
++
+diff -up libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY libjingle-0.5.1/talk/xmllite/Makefile.am
+--- libjingle-0.5.1/talk/xmllite/Makefile.am.SANITY 2010-11-19 15:06:35.534284310 -0500
++++ libjingle-0.5.1/talk/xmllite/Makefile.am 2010-11-19 15:06:35.534284310 -0500
+@@ -0,0 +1,21 @@
++lib_LTLIBRARIES = libjinglexmllite.la
++
++libjinglexmllite_la_SOURCES = qname.cc \
++ xmlbuilder.cc \
++ xmlconstants.cc \
++ xmlelement.cc \
++ xmlnsstack.cc \
++ xmlparser.cc \
++ xmlprinter.cc
++
++libjinglexmllite_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/xmllite
++libjinglexmllite_include_HEADERS = qname.h \
++ xmlbuilder.h \
++ xmlconstants.h \
++ xmlelement.h \
++ xmlnsstack.h \
++ xmlparser.h \
++ xmlprinter.h
++AM_CPPFLAGS = -DPOSIX
++
++libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS)
+diff -up libjingle-0.5.1/talk/xmpp/Makefile.am.SANITY libjingle-0.5.1/talk/xmpp/Makefile.am
+--- libjingle-0.5.1/talk/xmpp/Makefile.am.SANITY 2010-11-19 15:06:35.535286215 -0500
++++ libjingle-0.5.1/talk/xmpp/Makefile.am 2010-11-19 15:06:35.534284310 -0500
+@@ -0,0 +1,35 @@
++lib_LTLIBRARIES = libjinglexmpp.la
++
++libjinglexmpp_la_SOURCES = constants.cc \
++ jid.cc \
++ saslmechanism.cc \
++ xmppclient.cc \
++ xmppengineimpl.cc \
++ xmppengineimpl_iq.cc \
++ xmpplogintask.cc \
++ xmppstanzaparser.cc \
++ xmpptask.cc \
++ ratelimitmanager.cc
++
++libjinglexmpp_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/xmpp
++libjinglexmpp_include_HEADERS = asyncsocket.h \
++ prexmppauth.h \
++ saslhandler.h \
++ xmpplogintask.h \
++ jid.h \
++ saslmechanism.h \
++ xmppclient.h \
++ constants.h \
++ saslplainmechanism.h \
++ xmppclientsettings.h \
++ xmppstanzaparser.h \
++ xmppengine.h \
++ xmpptask.h \
++ plainsaslhandler.h \
++ saslcookiemechanism.h \
++ xmppengineimpl.h \
++ ratelimitmanager.h
++
++libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CPPFLAGS = -DPOSIX
diff --git a/libjingle-0.5.1-devicemanager-alsafix.patch b/libjingle-0.5.1-devicemanager-alsafix.patch
new file mode 100644
index 0000000..a2e5e7b
--- /dev/null
+++ b/libjingle-0.5.1-devicemanager-alsafix.patch
@@ -0,0 +1,30 @@
+diff -up libjingle-0.5.1/talk/session/phone/devicemanager.cc.alsa libjingle-0.5.1/talk/session/phone/devicemanager.cc
+--- libjingle-0.5.1/talk/session/phone/devicemanager.cc.alsa 2010-11-19 12:26:06.864967001 -0500
++++ libjingle-0.5.1/talk/session/phone/devicemanager.cc 2010-11-19 12:30:59.090967002 -0500
+@@ -25,7 +25,7 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#include "talk/session/phone/devicemanager.h"
++#include "config.h"
+
+ #if WIN32
+ #include <atlbase.h>
+@@ -44,9 +44,7 @@
+ #include <QuickTime/QuickTime.h>
+ #elif LINUX
+ #include <unistd.h>
+-#ifndef USE_TALK_SOUND
+ #include <alsa/asoundlib.h>
+-#endif
+ #include "talk/base/linux.h"
+ #include "talk/base/fileutils.h"
+ #include "talk/base/pathutils.h"
+@@ -54,6 +52,7 @@
+ #include "talk/session/phone/v4llookup.h"
+ #endif
+
++#include "talk/session/phone/devicemanager.h"
+ #include "talk/base/logging.h"
+ #include "talk/base/stringutils.h"
+ #include "talk/session/phone/mediaengine.h"
diff --git a/libjingle-0.5.1-statfix.patch b/libjingle-0.5.1-statfix.patch
new file mode 100644
index 0000000..b6b64af
--- /dev/null
+++ b/libjingle-0.5.1-statfix.patch
@@ -0,0 +1,22 @@
+diff -up libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix libjingle-0.5.1/talk/base/physicalsocketserver.cc
+--- libjingle-0.5.1/talk/base/physicalsocketserver.cc.statfix 2010-11-18 16:25:20.475761998 -0500
++++ libjingle-0.5.1/talk/base/physicalsocketserver.cc 2010-11-18 16:26:37.294762015 -0500
+@@ -34,6 +34,7 @@
+ #ifdef POSIX
+ #include <string.h>
+ #include <errno.h>
++#include <time.h>
+ #include <fcntl.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+diff -up libjingle-0.5.1/talk/base/stream.cc.statfix libjingle-0.5.1/talk/base/stream.cc
+--- libjingle-0.5.1/talk/base/stream.cc.statfix 2010-11-18 16:27:09.870761999 -0500
++++ libjingle-0.5.1/talk/base/stream.cc 2010-11-18 16:27:43.842762002 -0500
+@@ -26,6 +26,7 @@
+ */
+
+ #if defined(POSIX)
++#include <time.h>
+ #include <sys/file.h>
+ #endif // POSIX
+ #include <sys/types.h>
diff --git a/libjingle-0.5.1-system-expat.patch b/libjingle-0.5.1-system-expat.patch
new file mode 100644
index 0000000..ee79a8a
--- /dev/null
+++ b/libjingle-0.5.1-system-expat.patch
@@ -0,0 +1,60 @@
+diff -up libjingle-0.5.1/talk/xmllite/xmlbuilder.cc.system-expat libjingle-0.5.1/talk/xmllite/xmlbuilder.cc
+--- libjingle-0.5.1/talk/xmllite/xmlbuilder.cc.system-expat 2010-11-19 11:05:16.419967001 -0500
++++ libjingle-0.5.1/talk/xmllite/xmlbuilder.cc 2010-11-19 11:05:28.161967001 -0500
+@@ -33,7 +33,7 @@
+ #ifdef EXPAT_RELATIVE_PATH
+ #include "lib/expat.h"
+ #else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
++#include <expat.h>
+ #endif // EXPAT_RELATIVE_PATH
+
+ namespace buzz {
+diff -up libjingle-0.5.1/talk/xmllite/xmlbuilder.h.system-expat libjingle-0.5.1/talk/xmllite/xmlbuilder.h
+--- libjingle-0.5.1/talk/xmllite/xmlbuilder.h.system-expat 2010-11-19 11:04:49.214967000 -0500
++++ libjingle-0.5.1/talk/xmllite/xmlbuilder.h 2010-11-19 11:05:05.753967002 -0500
+@@ -36,7 +36,7 @@
+ #ifdef EXPAT_RELATIVE_PATH
+ #include "lib/expat.h"
+ #else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
++#include <expat.h>
+ #endif // EXPAT_RELATIVE_PATH
+
+ namespace buzz {
+diff -up libjingle-0.5.1/talk/xmllite/xmlparser.cc.system-expat libjingle-0.5.1/talk/xmllite/xmlparser.cc
+--- libjingle-0.5.1/talk/xmllite/xmlparser.cc.system-expat 2010-11-19 11:05:55.471967002 -0500
++++ libjingle-0.5.1/talk/xmllite/xmlparser.cc 2010-11-19 11:06:07.578967000 -0500
+@@ -38,7 +38,7 @@
+ #ifdef EXPAT_RELATIVE_PATH
+ #include "lib/expat.h"
+ #else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
++#include <expat.h>
+ #endif // EXPAT_RELATIVE_PATH
+
+ namespace buzz {
+diff -up libjingle-0.5.1/talk/xmllite/xmlparser.h.system-expat libjingle-0.5.1/talk/xmllite/xmlparser.h
+--- libjingle-0.5.1/talk/xmllite/xmlparser.h.system-expat 2010-11-19 11:05:38.778967001 -0500
++++ libjingle-0.5.1/talk/xmllite/xmlparser.h 2010-11-19 11:05:50.330967001 -0500
+@@ -34,7 +34,7 @@
+ #ifdef EXPAT_RELATIVE_PATH
+ #include "lib/expat.h"
+ #else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
++#include <expat.h>
+ #endif // EXPAT_RELATIVE_PATH
+
+ struct XML_ParserStruct;
+diff -up libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc.system-expat libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc
+--- libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc.system-expat 2010-11-19 11:06:25.677966995 -0500
++++ libjingle-0.5.1/talk/xmpp/xmppstanzaparser.cc 2010-11-19 11:06:37.048967002 -0500
+@@ -32,7 +32,7 @@
+ #ifdef EXPAT_RELATIVE_PATH
+ #include "lib/expat.h"
+ #else
+-#include "third_party/expat/v2_0_1/Source/lib/expat.h"
++#include <expat.h>
+ #endif
+
+ namespace buzz {
diff --git a/libjingle-0.5.1-system-srtp.patch b/libjingle-0.5.1-system-srtp.patch
new file mode 100644
index 0000000..57c85a1
--- /dev/null
+++ b/libjingle-0.5.1-system-srtp.patch
@@ -0,0 +1,12 @@
+diff -up libjingle-0.5.1/talk/session/phone/srtpfilter.cc.system-srtp libjingle-0.5.1/talk/session/phone/srtpfilter.cc
+--- libjingle-0.5.1/talk/session/phone/srtpfilter.cc.system-srtp 2010-11-19 11:09:50.271967001 -0500
++++ libjingle-0.5.1/talk/session/phone/srtpfilter.cc 2010-11-19 11:10:10.295966994 -0500
+@@ -47,7 +47,7 @@
+ #ifdef SRTP_RELATIVE_PATH
+ #include "srtp.h" // NOLINT
+ #else
+-#include "third_party/libsrtp/include/srtp.h"
++#include <srtp.h>
+ #endif // SRTP_RELATIVE_PATH
+ #ifdef _DEBUG
+ extern "C" debug_module_t mod_srtp;
diff --git a/libjingle-0.5.1-timefix.patch b/libjingle-0.5.1-timefix.patch
new file mode 100644
index 0000000..acda956
--- /dev/null
+++ b/libjingle-0.5.1-timefix.patch
@@ -0,0 +1,19 @@
+diff -up libjingle-0.5.1/talk/base/thread.cc.timefix libjingle-0.5.1/talk/base/thread.cc
+--- libjingle-0.5.1/talk/base/thread.cc.timefix 2010-11-19 10:53:41.509966999 -0500
++++ libjingle-0.5.1/talk/base/thread.cc 2010-11-19 10:53:51.317967002 -0500
+@@ -25,14 +25,13 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#include "talk/base/thread.h"
+-
+ #if defined(WIN32)
+ #include <comdef.h>
+ #elif defined(POSIX)
+ #include <time.h>
+ #endif
+
++#include "talk/base/thread.h"
+ #include "talk/base/common.h"
+ #include "talk/base/logging.h"
+ #include "talk/base/stringutils.h"
diff --git a/libjingle-0.5.1-uint32-fix.patch b/libjingle-0.5.1-uint32-fix.patch
new file mode 100644
index 0000000..642c1f2
--- /dev/null
+++ b/libjingle-0.5.1-uint32-fix.patch
@@ -0,0 +1,12 @@
+diff -up libjingle-0.5.1/talk/base/md5.h.uint32 libjingle-0.5.1/talk/base/md5.h
+--- libjingle-0.5.1/talk/base/md5.h.uint32 2010-11-18 16:31:58.492762006 -0500
++++ libjingle-0.5.1/talk/base/md5.h 2010-11-18 16:32:06.322761999 -0500
+@@ -22,7 +22,7 @@
+ extern "C" {
+ #endif
+
+-typedef long unsigned int uint32;
++typedef unsigned int uint32;
+ typedef struct MD5Context MD5_CTX;
+
+ #define md5byte unsigned char
diff --git a/libjingle-0.5.1-unixfilesystemfix.patch b/libjingle-0.5.1-unixfilesystemfix.patch
new file mode 100644
index 0000000..8823f62
--- /dev/null
+++ b/libjingle-0.5.1-unixfilesystemfix.patch
@@ -0,0 +1,22 @@
+diff -up libjingle-0.5.1/talk/base/unixfilesystem.cc.missingheader libjingle-0.5.1/talk/base/unixfilesystem.cc
+--- libjingle-0.5.1/talk/base/unixfilesystem.cc.missingheader 2010-11-19 10:59:11.465967001 -0500
++++ libjingle-0.5.1/talk/base/unixfilesystem.cc 2010-11-19 11:02:12.027967004 -0500
+@@ -25,9 +25,8 @@
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-#include "talk/base/unixfilesystem.h"
+-
+ #include <errno.h>
++#include <time.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -56,6 +55,7 @@
+ #include <algorithm>
+ #endif
+
++#include "talk/base/unixfilesystem.h"
+ #include "talk/base/fileutils.h"
+ #include "talk/base/pathutils.h"
+ #include "talk/base/stream.h"
diff --git a/libjingle-0.5.1-v4llookup-fix.patch b/libjingle-0.5.1-v4llookup-fix.patch
new file mode 100644
index 0000000..026248f
--- /dev/null
+++ b/libjingle-0.5.1-v4llookup-fix.patch
@@ -0,0 +1,21 @@
+diff -up libjingle-0.5.1/talk/session/phone/v4llookup.cc.v4lfix libjingle-0.5.1/talk/session/phone/v4llookup.cc
+--- libjingle-0.5.1/talk/session/phone/v4llookup.cc.v4lfix 2010-11-19 12:37:12.153967002 -0500
++++ libjingle-0.5.1/talk/session/phone/v4llookup.cc 2010-11-19 12:38:47.910967002 -0500
+@@ -6,7 +6,8 @@
+ * The functionality is implemented as a class with virtual methods for
+ * the purpose of unit testing.
+ */
+-#include "talk/session/phone/v4llookup.h"
++
++#include "config.h"
+
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -18,6 +19,7 @@
+
+ #include <cstring>
+
++#include "talk/session/phone/v4llookup.h"
+ #include "talk/base/logging.h"
+
+ namespace cricket {
More information about the scm-commits
mailing list