Author: glen Date: Thu Jan 6 10:50:55 2011 GMT Module: packages Tag: HEAD ---- Log message: - fedora patches renamed for fugure updates: $ rename 'libjingle-0.5.1-' '' libjingle-0.5.1-*.patch
---- Files affected: packages/libjingle: 64bittypes.patch (NONE -> 1.1) (NEW), C-linkage-fix.patch (NONE -> 1.1) (NEW), NULL-fix.patch (NONE -> 1.1) (NEW), build-sanity.patch (NONE -> 1.1) (NEW), devicemanager-alsafix.patch (NONE -> 1.1) (NEW), fixconflict.patch (NONE -> 1.1) (NEW), qname-threadsafe.patch (NONE -> 1.1) (NEW), statfix.patch (NONE -> 1.1) (NEW), system-expat.patch (NONE -> 1.1) (NEW), system-srtp.patch (NONE -> 1.1) (NEW), timefix.patch (NONE -> 1.1) (NEW), uint32-fix.patch (NONE -> 1.1) (NEW), unixfilesystemfix.patch (NONE -> 1.1) (NEW), v4llookup-fix.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/libjingle/64bittypes.patch diff -u /dev/null packages/libjingle/64bittypes.patch:1.1 --- /dev/null Thu Jan 6 11:50:55 2011 +++ packages/libjingle/64bittypes.patch Thu Jan 6 11:50:49 2011 @@ -0,0 +1,28 @@ +diff -up libjingle-0.5.1/talk/base/basictypes.h.64bit libjingle-0.5.1/talk/base/basictypes.h +--- libjingle-0.5.1/talk/base/basictypes.h.64bit 2010-11-22 12:42:33.480425694 -0500 ++++ libjingle-0.5.1/talk/base/basictypes.h 2010-11-22 12:44:51.657425696 -0500 +@@ -43,7 +43,11 @@ + #ifdef COMPILER_MSVC + typedef __int64 int64; + #else ++#if __LP64__ ++typedef long int64; ++#else + typedef long long int64; ++#endif + #endif /* COMPILER_MSVC */ + typedef int int32; + typedef short int16; +@@ -60,8 +64,11 @@ typedef __int64 int64; + #endif + #define INT64_F "I64" + #else ++#if __LP64__ ++typedef unsigned long uint64; ++#else + typedef unsigned long long uint64; +-typedef long long int64; ++#endif + #ifndef INT64_C + #define INT64_C(x) x ## LL + #endif ================================================================ Index: packages/libjingle/C-linkage-fix.patch diff -u /dev/null packages/libjingle/C-linkage-fix.patch:1.1 --- /dev/null Thu Jan 6 11:50:55 2011 +++ packages/libjingle/C-linkage-fix.patch Thu Jan 6 11:50:49 2011 @@ -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. ================================================================ Index: packages/libjingle/NULL-fix.patch diff -u /dev/null packages/libjingle/NULL-fix.patch:1.1 --- /dev/null Thu Jan 6 11:50:55 2011 +++ packages/libjingle/NULL-fix.patch Thu Jan 6 11:50:49 2011 @@ -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> ================================================================ Index: packages/libjingle/build-sanity.patch diff -u /dev/null packages/libjingle/build-sanity.patch:1.1 --- /dev/null Thu Jan 6 11:50:55 2011 +++ packages/libjingle/build-sanity.patch Thu Jan 6 11:50:49 2011 @@ -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-o...@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)/libjing...@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 @@ ++pref...@prefix@ ++exec_pref...@exec_prefix@ ++libd...@libdir@ ++included...@includedir@ ++ ++Name: jinglebase ++Description: Jingle Base Library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lpthread -ljinglebase ++Cflags: -I${includedir}/libjing...@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 @@ ++pref...@prefix@ ++exec_pref...@exec_prefix@ ++libd...@libdir@ ++included...@includedir@ ++ ++Name: jinglep2p ++Description: Jingle P2P Library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat ++Cflags: -I${includedir}/libjing...@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 @@ ++pref...@prefix@ ++exec_pref...@exec_prefix@ ++libd...@libdir@ ++included...@includedir@ ++ ++Name: jinglesessionphone ++Description: Jingle Session Phone Library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp ++Cflags: -I${includedir}/libjing...@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 @@ ++pref...@prefix@ ++exec_pref...@exec_prefix@ ++libd...@libdir@ ++included...@includedir@ ++ ++Name: jinglesessiontunnel ++Description: Jingle Session Tunnel Library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lpthread -ljinglesessiontunnel ++Cflags: -I${includedir}/libjing...@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 = jingleba...@libjingle_majorminor@.pc jinglep...@libjingle_majorminor@.pc jinglesessiontunn...@libjingle_majorminor@.pc jinglesessionpho...@libjingle_majorminor@.pc ++ ++all-local: $(pcfiles) ++ ++### how to generate pc files +...@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)/libjing...@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)/libjing...@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)/libjing...@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 <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit