Add libjingle version 0.4.0, plus some patches

that are described in README.chromium and
a .diff file, under review separately.

I removed some of the weightier
autoconf/configure scripts.  This brought the
size of the library from 3.8MB to about 2.3MB.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/199090

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26154 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 201 insertions, 0 deletions

diff --git a/third_party/libjingle/overrides/config.h b/third_party/libjingle/overrides/config.h
new file mode 100644
index 0000000..872d609
--- /dev/null
+++ b/third_party/libjingle/overrides/config.h
@@ -0,0 +1,121 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file provides a <config.h> include for compiling libjingle.
+// This file was generated using libjingle's autoconf utility.
+// It fixes compilation in linux.
+
+/* Chat archiving */
+//#define FEATURE_ENABLE_CHAT_ARCHIVING 1
+
+/* Enable SSL */
+//#define FEATURE_ENABLE_SSL 1
+
+/* voice mail */
+//#define FEATURE_ENABLE_VOICEMAIL 1
+
+/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
+/* #undef HAVE_ALSA_ASOUNDLIB_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Have GIPS Voice Engine */
+#define HAVE_GIPS 1
+
+/* Glib is required for oRTP code */
+/* #undef HAVE_GLIB */
+
+/* Defined when we have ilbc codec lib */
+/* #undef HAVE_ILBC */
+
+/* Define to 1 if you have the <iLBC_decode.h> header file. */
+/* #undef HAVE_ILBC_DECODE_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the <openssl/ssl.h> header file. */
+#define HAVE_OPENSSL_SSL_H 1
+
+/* Define if you have semtimedop() for SysV semaphares. */
+#define HAVE_SEMTIMEDOP 1
+
+/* has speex */
+/* #undef HAVE_SPEEX */
+
+/* Define to 1 if you have the <speex.h> header file. */
+/* #undef HAVE_SPEEX_H */
+
+/* Define to 1 if you have the <speex/speex.h> header file. */
+/* #undef HAVE_SPEEX_SPEEX_H */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Building on Linux */
+#define LINUX 1
+
+/* Logging */
+#define LOGGING 1
+
+/* Building on OSX */
+/* #undef OSX */
+
+/* Name of package */
+// #define PACKAGE "dist-zip"
+
+/* Define to the address where bug reports for this package should be sent. */
+// #define PACKAGE_BUGREPORT "google-talk-open@googlegroups.com"
+
+/* Define to the full name of this package. */
+// #define PACKAGE_NAME "libjingle"
+
+/* Define to the full name and version of this package. */
+// #define PACKAGE_STRING "libjingle 0.3.0"
+
+/* Define to the one symbol short name of this package. */
+// #define PACKAGE_TARNAME "libjingle"
+
+/* Define to the version of this package. */
+// #define PACKAGE_VERSION "0.3.0"
+
+/* If we're using configure, we're on POSIX */
+// #define POSIX 1
+
+/* Build as a production build */
+//#define PRODUCTION 1
+
+/* Build as a production build */
+//#define PRODUCTION_BUILD 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+// #define VERSION ""
+
+/* Defined when alsa support is enabled */
+/* #undef __ALSA_ENABLED__ */
diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h
new file mode 100644
index 0000000..ab42029
--- /dev/null
+++ b/third_party/libjingle/overrides/talk/base/basictypes.h
@@ -0,0 +1,46 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file overrides the inclusion of talk/base/basictypes.h to remove
+// collisions with Chromium's base/basictypes.h.   We then add back a few
+// items that Chromium's version doesn't provide, but libjingle expects.
+
+#ifndef OVERRIDES_TALK_BASE_BASICTYPES_H__
+#define OVERRIDES_TALK_BASE_BASICTYPES_H__
+
+#include "base/basictypes.h"
+
+#ifndef INT_TYPES_DEFINED
+#define INT_TYPES_DEFINED
+#ifdef COMPILER_MSVC
+typedef __int64 int64;
+#else
+typedef long long int64;
+#endif /* COMPILER_MSVC */
+
+#ifdef COMPILER_MSVC
+typedef unsigned __int64 uint64;
+typedef __int64 int64;
+#define INT64_C(x) x ## I64
+#define UINT64_C(x) x ## UI64
+#define INT64_F "I64"
+#else
+typedef unsigned long long uint64;
+typedef long long int64;
+#define INT64_C(x) x ## LL
+#define UINT64_C(x) x ## ULL
+#define INT64_F "ll"
+#endif /* COMPILER_MSVC */
+#endif  // INT_TYPES_DEFINED
+
+#ifdef WIN32
+typedef int socklen_t;
+#endif
+
+namespace talk_base {
+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; }
+}
+
+#endif // OVERRIDES_TALK_BASE_BASICTYPES_H__
diff --git a/third_party/libjingle/overrides/talk/base/constructormagic.h b/third_party/libjingle/overrides/talk/base/constructormagic.h
new file mode 100644
index 0000000..012357e
--- /dev/null
+++ b/third_party/libjingle/overrides/talk/base/constructormagic.h
@@ -0,0 +1,14 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file overrides the inclusion of talk/base/constructormagic.h
+// We do this because constructor magic defines DISALLOW_EVIL_CONSTRUCTORS,
+// but we want to use the version from Chromium.
+
+#ifndef OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__
+#define OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__
+
+#include "base/basictypes.h"
+
+#endif  // OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__
diff --git a/third_party/libjingle/overrides/talk/base/scoped_ptr.h b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
new file mode 100644
index 0000000..bfe5f14
--- /dev/null
+++ b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
@@ -0,0 +1,20 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file overrides the inclusion of talk/base/scoped_ptr.h.  We use
+// a version of scoped_ptr from Chromium base, to avoid multiple definitions.
+
+#ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H__
+#define OVERRIDES_TALK_BASE_SCOPED_PTR_H__
+
+#include "base/scoped_ptr.h"
+
+namespace talk_base {
+
+using ::scoped_ptr;
+using ::scoped_array;
+
+}  // namespace talk_base
+
+#endif // OVERRIDES_TALK_BASE_SCOPED_PTR_H__