Want more features on Pastebin? Sign Up, it's FREE!
Guest

libjingle patch

By: a guest on Nov 25th, 2011  |  syntax: None  |  size: 2.31 KB  |  views: 298  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/libjingle-0.6.3/talk/libjingle.scons b/libjingle-0.6.3.old/talk/libjingle.scons
  2. index c5c247f..98e8cb3 100644
  3. --- a/libjingle-0.6.3/talk/libjingle.scons
  4. +++ b/libjingle-0.6.3.old/talk/libjingle.scons
  5. @@ -12,7 +12,6 @@ talk.Library(env, name = "expat",
  6.               ],
  7.               includedirs = [
  8.                 "third_party/expat-2.0.1/lib",
  9. -               "third_party/expat-2.0.1",
  10.               ],
  11.               win_cppdefines = [
  12.                 "COMPILED_FROM_DSP",
  13. diff --git a/libjingle-0.6.3/talk/main.scons b/libjingle-0.6.3.old/talk/main.scons
  14. index 4b1cf12..689288f 100644
  15. --- a/libjingle-0.6.3/talk/main.scons
  16. +++ b/libjingle-0.6.3.old/talk/main.scons
  17. @@ -300,6 +300,7 @@ posix_env.Append(
  18.    CXXFLAGS = [
  19.      '-Wno-non-virtual-dtor',
  20.      '-Wno-ctor-dtor-privacy',
  21. +    '-fno-rtti',
  22.    ],
  23.  )
  24.  
  25. @@ -320,7 +321,7 @@ mac_env.Append(
  26.    CCFLAGS = [
  27.      '-m32',
  28.      '-arch', 'i386',
  29. -    '-isysroot', '/Developer/SDKs/MacOSX10.7.sdk',
  30. +    '-isysroot', '/Developer/SDKs/MacOSX10.5.sdk',
  31.      '-fasm-blocks',
  32.    ],
  33.    LINKFLAGS = [
  34. @@ -332,7 +333,7 @@ mac_env.Append(
  35.      '-ObjC',
  36.      '-arch', 'i386',
  37.      '-mmacosx-version-min=10.5',
  38. -    '-isysroot', '/Developer/SDKs/MacOSX10.7.sdk',
  39. +    '-isysroot', '/Developer/SDKs/MacOSX10.5.sdk',
  40.      '-m32',
  41.      '-dead_strip',
  42.    ],
  43. @@ -350,9 +351,6 @@ mac_env.Append(
  44.    ]
  45.  )
  46.  
  47. -mac_env.Replace(
  48. -  RPATH = [],
  49. -)
  50.  
  51.  mac_dbg_env = mac_env.Clone(
  52.    BUILD_TYPE = 'dbg',
  53. @@ -387,7 +385,6 @@ mac_opt_env.Append(
  54.    ],
  55.    # Hammer automatically specifies -Os for mac opt.
  56.  )
  57. -
  58.  envs.append(mac_opt_env)
  59.  
  60.  #-------------------------------------------------------------------------------
  61. diff --git a/libjingle-0.6.3/talk/session/phone/srtpfilter_unittest.cc b/libjingle-0.6.3.old/talk/session/phone/srtpfilter_unittest.cc
  62. index 4b1b28f..f519633 100644
  63. --- a/libjingle-0.6.3/talk/session/phone/srtpfilter_unittest.cc
  64. +++ b/libjingle-0.6.3.old/talk/session/phone/srtpfilter_unittest.cc
  65. @@ -32,7 +32,7 @@
  66.  #include "talk/session/phone/cryptoparams.h"
  67.  #include "talk/session/phone/fakertp.h"
  68.  #include "talk/session/phone/srtpfilter.h"
  69. -#include "third_party/srtp/crypto/include/err.h"
  70. +#include "third_party/libsrtp/crypto/include/err.h"
  71.  
  72.  using cricket::CS_AES_CM_128_HMAC_SHA1_80;
  73.  using cricket::CS_AES_CM_128_HMAC_SHA1_32;
  74.  
clone this paste RAW Paste Data