[SCM] qtmultimedia packaging branch, ubuntu, updated. ubuntu/5.6.1-2ubuntu1-6-g872b72d

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 872b72d578879e91faf3255894d2d5c5dade9648
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 2 06:13:57 2017 +0000

    Add opusenc support needed by Telegram app (LP: #1630399)
---
 debian/changelog                                   |  9 +++++-
 debian/patches/adding_gstreamer_opus_support.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5470b8a..72e6dd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-qtmultimedia-opensource-src (5.6.1-2ubuntu2) UNRELEASED; urgency=medium
+qtmultimedia-opensource-src (5.6.1-2ubuntu3~1) zesty; urgency=medium
+
+  [ Devid Antonio Filoni ]
+  * Add opusenc support needed by Telegram app (LP: #1630399)
+
+ -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato at canonical.com>  Fri, 04 Nov 2016 12:42:19 +0100
+
+qtmultimedia-opensource-src (5.6.1-2ubuntu2~1) yakkety; urgency=medium
 
   * debian/patches/Optimize-QMediaPlaylistPrivate-readItems.patch
     - Fix load() (LP: #1510225)
diff --git a/debian/patches/adding_gstreamer_opus_support.patch b/debian/patches/adding_gstreamer_opus_support.patch
new file mode 100644
index 0000000..c522026
--- /dev/null
+++ b/debian/patches/adding_gstreamer_opus_support.patch
@@ -0,0 +1,37 @@
+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();
+ 
+     foreach( const QByteArray& codecName, codecCandidates ) {
+         QByteArray elementName = m_elementNames[codecName];
diff --git a/debian/patches/series b/debian/patches/series
index d831094..125b3b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch
 Added-insertItems-and-removeItems-to-QML-Playlist.patch
 Add-moveItem-from-to-to-QMediaPlaylist.patch
 Optimize-QMediaPlaylistPrivate-readItems.patch
+adding_gstreamer_opus_support.patch

-- 
qtmultimedia packaging