[SCM] qtmultimedia packaging branch, ubuntu, updated. debian/5.5.1-1-17-g8a76737

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=44ad52b

The following commit has been merged in the ubuntu branch:
commit 44ad52b42044a7a7ba54d21142e8dd9a752d4aa6
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Oct 19 09:17:37 2015 +0000

    Drop upstreamed patch qgstreamercapturesession_avoid_race_eos.patch
---
 debian/changelog                                   |  1 +
 .../qgstreamercapturesession_avoid_race_eos.patch  | 24 ----------------------
 debian/patches/series                              |  3 ++-
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23871a0..db8e241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ qtmultimedia-opensource-src (5.5.1-1ubuntu1) UNRELEASED; urgency=medium
       Qt 5.6, use backported versions of those.
   * debian/patches/Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch
   * Regenerate headers for the audio role API
+  * Drop upstreamed patch qgstreamercapturesession_avoid_race_eos.patch
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 17 Jul 2015 13:14:07 +0000
 
diff --git a/debian/patches/qgstreamercapturesession_avoid_race_eos.patch b/debian/patches/qgstreamercapturesession_avoid_race_eos.patch
deleted file mode 100644
index 2c7f9fe..0000000
--- a/debian/patches/qgstreamercapturesession_avoid_race_eos.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
-Title: Avoid races when sending EOS, making sure pipeline is in playing state first
-Forwarded: yes
-Bug: https://bugreports.qt.io/browse/QTBUG-45707
-Bug-Ubuntu: https://launchpad.net/bugs/1433563
-
-Index: qtmultimedia-opensource-src-5.4.1/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-===================================================================
---- qtmultimedia-opensource-src-5.4.1.orig/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-+++ qtmultimedia-opensource-src-5.4.1/src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp
-@@ -828,11 +828,11 @@ void QGstreamerCaptureSession::setState(
-             if (!m_waitingForEos) {
-                 m_waitingForEos = true;
-                 //qDebug() << "Waiting for EOS";
-+                // Unless gstreamer is in GST_STATE_PLAYING our EOS message will not be received.
-+                gst_element_set_state(m_pipeline, GST_STATE_PLAYING);
-                 //with live sources it's necessary to send EOS even to pipeline
-                 //before going to STOPPED state
-                 gst_element_send_event(m_pipeline, gst_event_new_eos());
--                // Unless gstreamer is in GST_STATE_PLAYING our EOS message will not be received.
--                gst_element_set_state(m_pipeline, GST_STATE_PLAYING);
- 
-                 return;
-             } else {
diff --git a/debian/patches/series b/debian/patches/series
index 2f593a7..79c9bbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 rpath_nonlinux.diff
 skip_failing_tests.patch
-qgstreamercapturesession_avoid_race_eos.patch
+
+# Backported patches
 Added-new-playlist-QML-type.patch
 Add-audio-role-API-to-QMediaPlayer.patch
 Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch

-- 
qtmultimedia packaging