[SCM] qtmultimedia packaging branch, ubuntu+1, updated. debian/5.9.0-2-58-gb29bc69

[Dmitry Shachnev]

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

The following commit has been merged in the ubuntu+1 branch:
commit a5b622776665aa1f9654298187f8b65f7ec42825
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 21 16:57:34 2017 +0300

    Drop adding_gstreamer_opus_support.patch.
    
    Upstream now loads the list of codecs dynamically (see QTBUG-50567).
---
 debian/changelog                                   |  2 ++
 debian/patches/adding_gstreamer_opus_support.patch | 37 ----------------------
 debian/patches/series                              |  5 ---
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78dd0de..5d406e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtmultimedia-opensource-src (5.9.0-2ubuntu1) UNRELEASED; urgency=medium
     - Install Qt5Quick_QSGVideoNodeFactory_EGL.cmake on arm64.
   * Dropped changes:
     - Support dual -gles packages in debian/libqt5multimediawidgets5.symbols.
+  * Drop adding_gstreamer_opus_support.patch, upstream now loads the list of
+    codecs dynamically (see QTBUG-50567).
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Wed, 21 Jun 2017 16:49:13 +0300
 
diff --git a/debian/patches/adding_gstreamer_opus_support.patch b/debian/patches/adding_gstreamer_opus_support.patch
deleted file mode 100644
index f42e911..0000000
--- a/debian/patches/adding_gstreamer_opus_support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Add opusenc support needed by Telegram app (LP: #1630399)
-Author: Devid Antonio Filoni <d.filoni at ubuntu.com>
-Bug: https://bugreports.qt.io/browse/QTBUG-50567
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1630399
-Reviewed-By: Alfonso Sanchez-Beato <alfonso.sanchez-beato at canonical.com>
-
---- qtmultimedia-opensource-src-5.6.1.orig/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
-+++ qtmultimedia-opensource-src-5.6.1/src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
-@@ -47,10 +47,10 @@ QGstreamerAudioEncode::QGstreamerAudioEn
- 
- #if defined(Q_WS_MAEMO_6)
-     codecCandidates << "audio/AAC" << "audio/mpeg" << "audio/vorbis" << "audio/speex" << "audio/GSM"
--                    << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC";
-+                    << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC" << "audio/x-opus";
- #else
-     codecCandidates << "audio/mpeg" << "audio/vorbis" << "audio/speex" << "audio/GSM"
--                    << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC";
-+                    << "audio/PCM" << "audio/AMR" << "audio/AMR-WB" << "audio/FLAC" << "audio/x-opus";
- #endif
- 
- #if defined(Q_WS_MAEMO_6)
-@@ -68,6 +68,7 @@ QGstreamerAudioEncode::QGstreamerAudioEn
-     m_elementNames["audio/PCM"] = "audioresample";
-     m_elementNames["audio/FLAC"] = "flacenc";
-     m_elementNames["audio/GSM"] = "gsmenc";
-+    m_elementNames["audio/x-opus"] = "opusenc";
- 
-     m_codecOptions["audio/vorbis"] = QStringList() << "min-bitrate" << "max-bitrate";
-     m_codecOptions["audio/mpeg"] = QStringList() << "mode";
-@@ -76,6 +77,7 @@ QGstreamerAudioEncode::QGstreamerAudioEn
-     m_codecOptions["audio/PCM"] = QStringList();
-     m_codecOptions["audio/AMR"] = QStringList();
-     m_codecOptions["audio/AMR-WB"] = QStringList();
-+    m_codecOptions["audio/x-opus"] = QStringList();
- 
-     for (const QByteArray& codecName : qAsConst(codecCandidates)) {
-         QByteArray elementName = m_elementNames[codecName];
diff --git a/debian/patches/series b/debian/patches/series
index 5b750a6..42d57c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
 rpath_nonlinux.diff
 skip_failing_tests.patch
-
-# Backported patches
-
-# Ubuntu patches
-adding_gstreamer_opus_support.patch # to be replaced by upstream 5.9 solution

-- 
qtmultimedia packaging