From 0a6b24cd68342878c63c013853e6d113040b2048 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:24:54 +0000
Subject: import clutter-gst2-2.0.18-1.el7


---

diff --git a/.clutter-gst2.metadata b/.clutter-gst2.metadata
index 4f8efda..d39ffa7 100644
--- a/.clutter-gst2.metadata
+++ b/.clutter-gst2.metadata
@@ -1 +1 @@
-da6249c6ce686ba74e459402774831f19672379f SOURCES/clutter-gst-2.0.12.tar.xz
+28357cbdd2c733ba0ca9cf3a4401a0b16b5d391d SOURCES/clutter-gst-2.0.18.tar.xz
diff --git a/.gitignore b/.gitignore
index 8a88fed..b340c95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/clutter-gst-2.0.12.tar.xz
+SOURCES/clutter-gst-2.0.18.tar.xz
diff --git a/SOURCES/0001-video-sink-clear-buffer-in-flush.patch b/SOURCES/0001-video-sink-clear-buffer-in-flush.patch
deleted file mode 100644
index 9230aab..0000000
--- a/SOURCES/0001-video-sink-clear-buffer-in-flush.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6dd67050554caf7e689a0de28807631b56d01b16 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 19 May 2015 13:31:12 +0200
-Subject: [PATCH] video-sink: clear buffer in flush
-
-We need to release our refs to the buffer in FLUSH_START so that
-upstream can free and reuse the memory.
----
- clutter-gst/clutter-gst-video-sink.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
-index 63867d4..ef6d996 100644
---- a/clutter-gst/clutter-gst-video-sink.c
-+++ b/clutter-gst/clutter-gst-video-sink.c
-@@ -1971,6 +1971,31 @@ clutter_gst_video_sink_propose_allocation (GstBaseSink * base_sink, GstQuery * q
-   return TRUE;
- }
- 
-+static gboolean
-+clutter_gst_video_sink_event (GstBaseSink * basesink, GstEvent * event)
-+{
-+  ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (basesink);
-+  ClutterGstVideoSinkPrivate *priv = sink->priv;
-+  ClutterGstSource *gst_source = priv->source;
-+
-+  switch (GST_EVENT_TYPE (event)) {
-+    case GST_EVENT_FLUSH_START:
-+      g_mutex_lock (&gst_source->buffer_lock);
-+      if (gst_source->buffer) {
-+        GST_DEBUG ("Freeing existing buffer %p", gst_source->buffer);
-+        gst_buffer_unref (gst_source->buffer);
-+        gst_source->buffer = NULL;
-+      }
-+      g_mutex_unlock (&gst_source->buffer_lock);
-+      break;
-+
-+    default:
-+      break;
-+  }
-+
-+  return GST_BASE_SINK_CLASS (parent_class)->event (basesink, event);
-+}
-+
- static void
- clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass * klass)
- {
-@@ -2007,6 +2032,7 @@ clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass * klass)
-   gstbase_sink_class->set_caps = clutter_gst_video_sink_set_caps;
-   gstbase_sink_class->get_caps = clutter_gst_video_sink_get_caps;
-   gstbase_sink_class->propose_allocation = clutter_gst_video_sink_propose_allocation;
-+  gstbase_sink_class->event = clutter_gst_video_sink_event;
- 
-   /**
-    * ClutterGstVideoSink:texture:
--- 
-2.1.0
-
diff --git a/SPECS/clutter-gst2.spec b/SPECS/clutter-gst2.spec
index 49288dd..366c040 100644
--- a/SPECS/clutter-gst2.spec
+++ b/SPECS/clutter-gst2.spec
@@ -1,12 +1,11 @@
 Name:           clutter-gst2
-Version:        2.0.12
-Release:        2%{?dist}
+Version:        2.0.18
+Release:        1%{?dist}
 Summary:        GStreamer integration for Clutter
 
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/clutter-gst/2.0/clutter-gst-%{version}.tar.xz
-Patch1:         0001-video-sink-clear-buffer-in-flush.patch
 
 BuildRequires:  clutter-devel
 BuildRequires:  gobject-introspection-devel
@@ -34,7 +33,6 @@ developing applications that use clutter-gst API version 2.0.
 
 %prep
 %setup -q -n clutter-gst-%{version}
-%patch1 -p1
 
 %build
 %configure
@@ -53,7 +51,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
 %{_libdir}/girepository-1.0/ClutterGst-2.0.typelib
 %{_libdir}/gstreamer-1.0/libgstclutter.so
 %{_libdir}/libclutter-gst-2.0.so.*
@@ -66,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/
 #doc #{_datadir}/gtk-doc/
 
 %changelog
+* Thu Feb 09 2017 Wim Taymans <wtaymans@redhat.com> - 2.0.18-1
+- Update to 2.0.18
+- Remove obsolete patches
+- Use license macro for COPYING
+- Resolves: #1386833
+
 * Tue May 19 2015 Wim Taymans <wtaymans@redhat.com> - 2.0.12-2
 - Add patch to flush video sink, fixes errors in cheese
 - Resolves: #1174515