build with system srtp if not building with system libjingle

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 8ce58262d2f67e965ac29eddf449c99aa1b941d8..a1ff2cc2e9169f17d665a4c6c86ff813b5eaf8f0 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -19,6 +19,7 @@
 %bcond_without system_libwebp  # system libwebp
 %bcond_without system_speex    # system speex
 %bcond_with            system_sqlite   # system sqlite
+%bcond_without system_srtp             # system srtp (can be used if using bundled libjingle)
 %bcond_with            system_v8               # system v8
 %bcond_without system_vpx              # system vpx
 %bcond_without system_yasm             # system yasm
@@ -96,6 +97,7 @@ Patch17:      system-icu.patch
 Patch18:       nacl-no-untar.patch
 Patch19:       system-jsoncpp.patch
 Patch20:       system-speex.patch
+Patch21:       system-srtp.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -148,6 +150,7 @@ BuildRequires:      rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.453
 %{?with_system_speex:BuildRequires:    speex-devel >= 1:1.2-rc1}
 BuildRequires: sqlite3-devel >= 3.6.1
+%{?with_system_srtp:BuildRequires:     srtp-devel >= 1.4.4}
 BuildRequires: subversion
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
@@ -247,6 +250,7 @@ cd src
 %patch16 -p1
 %patch17 -p0
 %patch19 -p1
+%patch21 -p1
 cd ..
 %patch18 -p1
 %patch20 -p1

diff --git a/clean-source.sh b/clean-source.sh
index 14e599dca0d7067d1f4cd69363a0251110243708..66eb30788d81088841bfa978828ca11d4a726c08 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -458,6 +458,7 @@ strip_system_dirs \
        third_party/libevent \
        third_party/libjpeg \
        third_party/libpng \
+       third_party/libsrtp \
        third_party/libusb \
        _third_party/libvpx \
        third_party/libwebp \

diff --git a/system-srtp.patch b/system-srtp.patch
new file mode 100644 (file)
index 0000000..7d35ee6
--- /dev/null
+++ b/system-srtp.patch
@@ -0,0 +1,43 @@
+diff -up chromium-20.0.1132.47/build/linux/system.gyp.system-srtp chromium-20.0.1132.47/build/linux/system.gyp
+--- chromium-20.0.1132.47/build/linux/system.gyp.system-srtp   2012-07-07 21:20:26.000000000 -0400
++++ chromium-20.0.1132.47/build/linux/system.gyp       2012-07-07 21:20:56.171006169 -0400
+@@ -651,6 +651,27 @@
+       ],
+     },
+     {
++      'target_name': 'libsrtp',
++      'type': 'none',
++      'conditions': [
++        ['_toolset=="target"', {
++          'direct_dependent_settings': {
++            'cflags': [
++              '<!@(<(pkg-config) --cflags libsrtp)',
++            ],
++          },
++          'link_settings': {
++            'ldflags': [
++              '<!@(<(pkg-config) --libs-only-L --libs-only-other libsrtp)',
++            ],
++            'libraries': [
++              '<!@(<(pkg-config) --libs-only-l libsrtp)',
++            ],
++          },
++        }],
++      ],
++    },
++    {
+       'target_name': 'udev',
+       'type': 'none',
+       'conditions': [
+diff -up chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-srtp chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp
+--- chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp.system-srtp      2012-06-28 09:01:45.000000000 -0400
++++ chromium-20.0.1132.47/third_party/libjingle/libjingle.gyp  2012-07-07 21:20:26.564006176 -0400
+@@ -617,7 +617,7 @@
+         ['OS!="android"', {
+           'dependencies': [
+             # We won't build with WebRTC on Android.
+-            '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
++            '../../build/linux/system.gyp:libsrtp',
+             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
+             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
+             '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',