[gstreamer-plugins-good] Rebase v4l2src-fix patch. Drop v4l2object-Don-t-probe-UVC-devices-for-being-interlace patch. Fixed u

[Brian Pepple]

commit c3e1fd18a93bb375ffb2d974e445efc0bca176d5
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sat Jul 14 12:43:49 2012 -0400

    Rebase v4l2src-fix patch.
    Drop v4l2object-Don-t-probe-UVC-devices-for-being-interlace patch. Fixed upstream.
    Drop v4l2_munmap and clear_DISCONT_flag patches. Fixed upstream.

 0001-fix-v4l2_munmap.patch                         |   58 --------------------
 0003-v4l2src-fix.patch => 0001-v4l2src-fix.patch   |    9 ++--
 0002-clear_DISCONT_flag.patch                      |   27 ---------
 ...Don-t-probe-UVC-devices-for-being-interla.patch |   46 ----------------
 gstreamer-plugins-good.spec                        |   16 ++----
 5 files changed, 10 insertions(+), 146 deletions(-)
---
diff --git a/0003-v4l2src-fix.patch b/0001-v4l2src-fix.patch
similarity index 66%
rename from 0003-v4l2src-fix.patch
rename to 0001-v4l2src-fix.patch
index a4bc90e..7ad54db 100644
--- a/0003-v4l2src-fix.patch
+++ b/0001-v4l2src-fix.patch
@@ -1,6 +1,7 @@
---- gst-plugins-good-0.10.31/sys/v4l2/gstv4l2object.c	2011-12-30 14:59:13.000000000 +0100
-+++ gst-plugins-good-0.10.31.fixed/sys/v4l2/gstv4l2object.c	2012-06-05 23:45:16.670981047 +0200
-@@ -1583,6 +1583,7 @@
+diff -urp gst-plugins-good-0.11.92.orig/sys/v4l2/gstv4l2object.c gst-plugins-good-0.11.92/sys/v4l2/gstv4l2object.c
+--- gst-plugins-good-0.11.92.orig/sys/v4l2/gstv4l2object.c	2012-04-23 04:08:48.000000000 -0400
++++ gst-plugins-good-0.11.92/sys/v4l2/gstv4l2object.c	2012-07-14 12:25:46.425060625 -0400
+@@ -1611,6 +1611,7 @@ gst_v4l2_object_probe_caps_for_format_an
  
    if (ival.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
      GValue rate = { 0, };
@@ -8,7 +9,7 @@
  
      g_value_init (&rates, GST_TYPE_LIST);
      g_value_init (&rate, GST_TYPE_FRACTION);
-@@ -1602,7 +1603,16 @@
+@@ -1630,7 +1631,16 @@ gst_v4l2_object_probe_caps_for_format_an
  
        /* swap to get the framerate */
        gst_value_set_fraction (&rate, denom, num);
diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec
index a2cb7c6..c54c4cc 100644
--- a/gstreamer-plugins-good.spec
+++ b/gstreamer-plugins-good.spec
@@ -20,13 +20,8 @@ Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source:         http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz
-# Cherry picks from upstream git which hopefully fix rhbz#815581
-#Patch1:         0001-fix-v4l2_munmap.patch
-#Patch2:         0002-clear_DISCONT_flag.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=677516
-#Patch3:         0003-v4l2src-fix.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=677722
-#Patch4:         0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
+Patch1:         0001-v4l2src-fix.patch
 
 Requires:       %{gstreamer} >= %{_gst}
 Requires:       gstreamer-plugins-base
@@ -131,13 +126,9 @@ which are not used very much and require additional libraries to be installed.
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
+%patch1 -p1
 
 %build
-
 %configure \
   --with-package-name='Fedora gstreamer-plugins-good package' \
   --with-package-origin='http://download.fedora.redhat.com/fedora' \
@@ -253,6 +244,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %changelog
 * Sat Jul 14 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.11.92-1
 - Update to 0.11.92
+- Rebase v4l2src-fix patch.
+- Drop v4l2object-Don-t-probe-UVC-devices-for-being-interlace patch. Fixed upstream.
+- Drop v4l2_munmap and clear_DISCONT_flag patches. Fixed upstream.
 - Update file list for gst-1.0.
 - Bump minimum version of flac needed.