drop system-srtp.patch; no longer needed

diff --git a/chromium-browser.spec b/chromium-browser.spec
index d228a51e900842fffc068f29f6611b195ef6bf33..681b8f22df91bf09ed2829253c53425892253109 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -26,7 +26,7 @@
 %bcond_with            system_protobuf # system protobuf
 %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_without system_libsrtp  # system srtp (can be used if using bundled libjingle)
 %bcond_with            system_v8               # system v8
 %bcond_without system_libvpx   # system libvpx
 %bcond_without system_yasm             # system yasm
@@ -99,7 +99,6 @@ Patch15:      nacl-build-irt.patch
 Patch16:       nacl-linkingfix.patch
 Patch18:       nacl-no-untar.patch
 Patch19:       system-jsoncpp.patch
-Patch21:       system-srtp.patch
 Patch22:       pulse_fix-157876.patch
 Patch23:       no-pnacl.patch
 Patch24:       nacl-verbose.patch
@@ -164,7 +163,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}
+%{?with_system_libsrtp:BuildRequires:  srtp-devel >= 1.4.4}
 BuildRequires: subversion
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
@@ -261,7 +260,6 @@ cd src
 %{!?with_libjpegturbo:%patch11 -p0}
 %patch16 -p1
 %patch19 -p1
-%patch21 -p1
 %patch22 -p1
 %patch25 -p1
 cd ..
@@ -375,6 +373,7 @@ test -e Makefile || %{__python} build/gyp_chromium \
        %{gyp_with system_harfbuzz} \
        %{gyp_with system_libexif} \
        %{gyp_with system_libmtp} \
+       %{gyp_with system_libsrtp} \
        %{gyp_with system_libusb} \
        %{gyp_with system_libvpx} \
        %{gyp_with system_libwebp} \

diff --git a/system-srtp.patch b/system-srtp.patch
deleted file mode 100644 (file)
index 7d35ee6..0000000
--- a/system-srtp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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',