[SCM] qtmultimedia packaging branch, ubuntu, updated. ubuntu/5.7.1-20161021-2ubuntu1
Timo Jyrinki
timo at moszumanska.debian.org
Tue Jan 10 07:42:36 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=04e9a34
The following commit has been merged in the ubuntu branch:
commit 04e9a340be010d20295706337595680034e8ea37
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Thu Sep 15 12:24:27 2016 +0000
New upstream release.
* New upstream release.
* Drop upstreamed patches:
- 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
---
debian/changelog | 10 ++
.../Add-moveItem-from-to-to-QMediaPlaylist.patch | 165 ---------------------
...ems-to-QML-Playlist-for-batch-adding-of-t.patch | 61 --------
...sertItems-and-removeItems-to-QML-Playlist.patch | 84 -----------
...ate-of-the-old-QMediaPlaylistControl-inst.patch | 85 -----------
debian/patches/series | 3 -
6 files changed, 10 insertions(+), 398 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a4718e2..59d0ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qtmultimedia-opensource-src (5.7.0-1ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop upstreamed patches:
+ - 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
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com> Thu, 15 Sep 2016 12:23:57 +0000
+
qtmultimedia-opensource-src (5.7.0-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/patches/Add-moveItem-from-to-to-QMediaPlaylist.patch b/debian/patches/Add-moveItem-from-to-to-QMediaPlaylist.patch
deleted file mode 100644
index 4995f94..0000000
--- a/debian/patches/Add-moveItem-from-to-to-QMediaPlaylist.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 170a217b3e2fb1688ae876ca60b1beab0331b123 Mon Sep 17 00:00:00 2001
-From: Jim Hodapp <jim.hodapp at canonical.com>
-Date: Fri, 27 Nov 2015 09:39:28 -0500
-Subject: [PATCH] Add moveItem(from, to) to QMediaPlaylist.
-
-Change-Id: Ic3c2ab35529ba5056b7f0d172a434e586e6cf03d
-Reviewed-by: Yoann Lopes <yoann.lopes at theqtcompany.com>
----
- src/imports/multimedia/qdeclarativeplaylist.cpp | 14 ++++++++++++++
- src/imports/multimedia/qdeclarativeplaylist_p.h | 1 +
- src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 10 ++++++++++
- src/multimedia/playback/qmedianetworkplaylistprovider_p.h | 1 +
- src/multimedia/playback/qmediaplaylist.cpp | 14 ++++++++++++++
- src/multimedia/playback/qmediaplaylist.h | 1 +
- src/multimedia/playback/qmediaplaylistprovider.cpp | 14 ++++++++++++++
- src/multimedia/playback/qmediaplaylistprovider_p.h | 1 +
- 8 files changed, 56 insertions(+)
-
-diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
-index 3432bf2..75be64b 100644
---- a/src/imports/multimedia/qdeclarativeplaylist.cpp
-+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
-@@ -479,6 +479,20 @@ bool QDeclarativePlaylist::insertItems(int index, const QList<QUrl> &sources)
- }
-
- /*!
-+ \qmlmethod bool QtMultimedia::Playlist::moveItem(from, to)
-+
-+ Moves the item at index position from to index position to.
-+
-+ Returns true if the item is moved successfully.
-+
-+ \since 5.7
-+*/
-+bool QDeclarativePlaylist::moveItem(int from, int to)
-+{
-+ return m_playlist->moveMedia(from, to);
-+}
-+
-+/*!
- \qmlmethod bool QtMultimedia::Playlist::removeItem(index)
-
- Removed the item at the given index from the playlist.
-diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
-index 295cbb1..66674eb 100644
---- a/src/imports/multimedia/qdeclarativeplaylist_p.h
-+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
-@@ -155,6 +155,7 @@ public Q_SLOTS:
- bool addItems(const QList<QUrl> &sources);
- bool insertItem(int index, const QUrl &source);
- bool insertItems(int index, const QList<QUrl> &sources);
-+ bool moveItem(int from, int to);
- bool removeItem(int index);
- bool removeItems(int start, int end);
- bool clear();
-diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
-index 88c2534..d763064 100644
---- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
-+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
-@@ -198,6 +198,16 @@ bool QMediaNetworkPlaylistProvider::insertMedia(int pos, const QList<QMediaConte
- return true;
- }
-
-+bool QMediaNetworkPlaylistProvider::moveMedia(int from, int to)
-+{
-+ Q_D(QMediaNetworkPlaylistProvider);
-+
-+ Q_UNUSED(from);
-+ Q_UNUSED(to);
-+
-+ return true;
-+}
-+
- bool QMediaNetworkPlaylistProvider::removeMedia(int fromPos, int toPos)
- {
- Q_D(QMediaNetworkPlaylistProvider);
-diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
-index 84e34c7..6fbdfe5 100644
---- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
-+++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
-@@ -69,6 +69,7 @@ public:
- virtual bool addMedia(const QList<QMediaContent> &items);
- virtual bool insertMedia(int pos, const QMediaContent &content);
- virtual bool insertMedia(int pos, const QList<QMediaContent> &items);
-+ virtual bool moveMedia(int from, int to);
- virtual bool removeMedia(int pos);
- virtual bool removeMedia(int start, int end);
- virtual bool clear();
-diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
-index 0681359..5f65a18 100644
---- a/src/multimedia/playback/qmediaplaylist.cpp
-+++ b/src/multimedia/playback/qmediaplaylist.cpp
-@@ -377,6 +377,20 @@ bool QMediaPlaylist::insertMedia(int pos, const QList<QMediaContent> &items)
- }
-
- /*!
-+ Move the item from position from to position to.
-+
-+ Returns true if the operation is successful, otherwise false.
-+
-+ \since 5.7
-+*/
-+bool QMediaPlaylist::moveMedia(int from, int to)
-+{
-+ QMediaPlaylistProvider *playlist = d_func()->playlist();
-+ return playlist->moveMedia(qBound(0, from, playlist->mediaCount()),
-+ qBound(0, to, playlist->mediaCount()));
-+}
-+
-+/*!
- Remove the item from the playlist at position pos.
-
- Returns true if the operation is successful, otherwise return false.
-diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
-index 1388ac1..e076877 100644
---- a/src/multimedia/playback/qmediaplaylist.h
-+++ b/src/multimedia/playback/qmediaplaylist.h
-@@ -85,6 +85,7 @@ public:
- bool addMedia(const QList<QMediaContent> &items);
- bool insertMedia(int index, const QMediaContent &content);
- bool insertMedia(int index, const QList<QMediaContent> &items);
-+ bool moveMedia(int from, int to);
- bool removeMedia(int pos);
- bool removeMedia(int start, int end);
- bool clear();
-diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp
-index fc3619f..d9c989c 100644
---- a/src/multimedia/playback/qmediaplaylistprovider.cpp
-+++ b/src/multimedia/playback/qmediaplaylistprovider.cpp
-@@ -207,6 +207,20 @@ bool QMediaPlaylistProvider::insertMedia(int position, const QList<QMediaContent
- return true;
- }
-
-+/*!
-+ Move the media from position from to position to.
-+
-+ Returns true if the operation is successful, otherwise false.
-+
-+ \since 5.7
-+*/
-+bool QMediaPlaylistProvider::moveMedia(int from, int to)
-+{
-+ Q_UNUSED(from);
-+ Q_UNUSED(to);
-+
-+ return false;
-+}
-
- /*!
- Removes the media at position from a playlist.
-diff --git a/src/multimedia/playback/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h
-index 57436d3..94b5918 100644
---- a/src/multimedia/playback/qmediaplaylistprovider_p.h
-+++ b/src/multimedia/playback/qmediaplaylistprovider_p.h
-@@ -81,6 +81,7 @@ public:
- virtual bool addMedia(const QList<QMediaContent> &contentList);
- virtual bool insertMedia(int index, const QMediaContent &content);
- virtual bool insertMedia(int index, const QList<QMediaContent> &content);
-+ virtual bool moveMedia(int from, int to);
- virtual bool removeMedia(int pos);
- virtual bool removeMedia(int start, int end);
- virtual bool clear();
---
-2.6.4
-
diff --git a/debian/patches/Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch b/debian/patches/Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch
deleted file mode 100644
index a0a0b14..0000000
--- a/debian/patches/Added-addItems-to-QML-Playlist-for-batch-adding-of-t.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 7228e7c8b79cd4ae74c6abd12317b43a7b1e6334 Mon Sep 17 00:00:00 2001
-From: Jim Hodapp <jim.hodapp at canonical.com>
-Date: Mon, 26 Oct 2015 13:17:02 -0400
-Subject: [PATCH] Added addItems to QML Playlist for batch adding of tracks.
-
-Change-Id: Ieb7df35ad9dd50bbc68e5305e0de9fb26c64b540
-Reviewed-by: Yoann Lopes <yoann.lopes at theqtcompany.com>
----
- src/imports/multimedia/qdeclarativeplaylist.cpp | 23 +++++++++++++++++++++++
- src/imports/multimedia/qdeclarativeplaylist_p.h | 1 +
- 2 files changed, 24 insertions(+)
-
-diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
-index bb785aa..c6ea1bd 100644
---- a/src/imports/multimedia/qdeclarativeplaylist.cpp
-+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
-@@ -421,6 +421,29 @@ bool QDeclarativePlaylist::addItem(const QUrl &source)
- }
-
- /*!
-+ \qmlmethod bool QtMultimedia::Playlist::addItems(sources)
-+
-+ Appends the list of URLs in sources to the playlist.
-+
-+ Returns true if the sources are added successfully.
-+
-+ \since 5.7
-+*/
-+bool QDeclarativePlaylist::addItems(const QList<QUrl> &sources)
-+{
-+ if (sources.isEmpty())
-+ return false;
-+
-+ QList<QMediaContent> contents;
-+ QList<QUrl>::const_iterator it = sources.constBegin();
-+ while (it != sources.constEnd()) {
-+ contents.push_back(QMediaContent(*it));
-+ ++it;
-+ }
-+ return m_playlist->addMedia(contents);
-+}
-+
-+/*!
- \qmlmethod bool QtMultimedia::Playlist::insertItem(index, source)
-
- Inserts the source URL to the playlist at the given index.
-diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
-index fd94135..2c6d015 100644
---- a/src/imports/multimedia/qdeclarativeplaylist_p.h
-+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
-@@ -152,6 +152,7 @@ public Q_SLOTS:
- void load(const QUrl &location, const QString &format = QString());
- bool save(const QUrl &location, const QString &format = QString());
- bool addItem(const QUrl &source);
-+ bool addItems(const QList<QUrl> &sources);
- bool insertItem(int index, const QUrl &source);
- bool removeItem(int index);
- bool clear();
---
-2.6.4
-
diff --git a/debian/patches/Added-insertItems-and-removeItems-to-QML-Playlist.patch b/debian/patches/Added-insertItems-and-removeItems-to-QML-Playlist.patch
deleted file mode 100644
index 03c4048..0000000
--- a/debian/patches/Added-insertItems-and-removeItems-to-QML-Playlist.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 8dddfe3f43606b385f48e8142c8ecb70d6c103a3 Mon Sep 17 00:00:00 2001
-From: Jim Hodapp <jim.hodapp at canonical.com>
-Date: Wed, 25 Nov 2015 16:06:07 -0500
-Subject: [PATCH] Added insertItems and removeItems to QML Playlist.
-
-Change-Id: Iba4d08551016c486e88e738e35fb590d82a058a2
-Reviewed-by: Yoann Lopes <yoann.lopes at theqtcompany.com>
----
- src/imports/multimedia/qdeclarativeplaylist.cpp | 37 +++++++++++++++++++++++++
- src/imports/multimedia/qdeclarativeplaylist_p.h | 2 ++
- 2 files changed, 39 insertions(+)
-
-diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
-index c6ea1bd..3432bf2 100644
---- a/src/imports/multimedia/qdeclarativeplaylist.cpp
-+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
-@@ -456,6 +456,29 @@ bool QDeclarativePlaylist::insertItem(int index, const QUrl &source)
- }
-
- /*!
-+ \qmlmethod bool QtMultimedia::Playlist::insertItems(index, sources)
-+
-+ Inserts the list of URLs in sources to the playlist at the given index.
-+
-+ Returns true if the sources are added successfully.
-+
-+ \since 5.7
-+*/
-+bool QDeclarativePlaylist::insertItems(int index, const QList<QUrl> &sources)
-+{
-+ if (sources.empty())
-+ return false;
-+
-+ QList<QMediaContent> contents;
-+ QList<QUrl>::const_iterator it = sources.constBegin();
-+ while (it != sources.constEnd()) {
-+ contents.push_back(QMediaContent(*it));
-+ ++it;
-+ }
-+ return m_playlist->insertMedia(index, contents);
-+}
-+
-+/*!
- \qmlmethod bool QtMultimedia::Playlist::removeItem(index)
-
- Removed the item at the given index from the playlist.
-@@ -468,6 +491,20 @@ bool QDeclarativePlaylist::removeItem(int index)
- }
-
- /*!
-+ \qmlmethod bool QtMultimedia::Playlist::removeItems(int start, int end)
-+
-+ Removes items in the playlist from start to \end inclusive.
-+
-+ Returns true if the items are removed successfully.
-+
-+ \since 5.7
-+*/
-+bool QDeclarativePlaylist::removeItems(int start, int end)
-+{
-+ return m_playlist->removeMedia(start, end);
-+}
-+
-+/*!
- \qmlmethod bool QtMultimedia::Playlist::clear()
-
- Removes all the items from the playlist.
-diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
-index 2c6d015..295cbb1 100644
---- a/src/imports/multimedia/qdeclarativeplaylist_p.h
-+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
-@@ -154,7 +154,9 @@ public Q_SLOTS:
- bool addItem(const QUrl &source);
- bool addItems(const QList<QUrl> &sources);
- bool insertItem(int index, const QUrl &source);
-+ bool insertItems(int index, const QList<QUrl> &sources);
- bool removeItem(int index);
-+ bool removeItems(int start, int end);
- bool clear();
-
- Q_SIGNALS:
---
-2.6.4
-
diff --git a/debian/patches/Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch b/debian/patches/Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch
deleted file mode 100644
index 8f3a556..0000000
--- a/debian/patches/Sync-the-state-of-the-old-QMediaPlaylistControl-inst.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 4cbd67c22a1d6aa339fc29bc5f7a9c0a40cc0b9e Mon Sep 17 00:00:00 2001
-From: Jim Hodapp <jim.hodapp at canonical.com>
-Date: Mon, 5 Oct 2015 14:56:29 -0400
-Subject: [PATCH] Sync the state of the old QMediaPlaylistControl instance with
- the new QMediaPlaylistControl instance when not using the default instance.
-
-Change-Id: I9d50cb445c86d96f70b366a0017715df2d2b4a29
----
- src/multimedia/playback/qmediaplaylist.cpp | 32 ++++++++++++++++++++++++++++++
- src/multimedia/playback/qmediaplaylist.h | 2 ++
- 2 files changed, 34 insertions(+)
-
-diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
-index 0681359..7db805d 100644
---- a/src/multimedia/playback/qmediaplaylist.cpp
-+++ b/src/multimedia/playback/qmediaplaylist.cpp
-@@ -145,6 +145,35 @@ QMediaObject *QMediaPlaylist::mediaObject() const
- }
-
- /*!
-+ * \internal
-+ * Copy playlist items, sync playback mode and sync current index between old control and new control
-+*/
-+void QMediaPlaylist::syncControls(QMediaPlaylistControl *oldControl, QMediaPlaylistControl *newControl)
-+{
-+ if (!oldControl || !newControl) {
-+ qWarning() << "Failed to sync control states since oldControl or newControl is NULL";
-+ return;
-+ }
-+
-+ newControl->setPlaybackMode(oldControl->playbackMode());
-+ emit newControl->playbackModeChanged(oldControl->playbackMode());
-+ newControl->setCurrentIndex(oldControl->currentIndex());
-+ emit newControl->currentIndexChanged(oldControl->currentIndex());
-+
-+ const QMediaPlaylistProvider *oldPlaylist = oldControl->playlistProvider();
-+ QMediaPlaylistProvider *newPlaylist = newControl->playlistProvider();
-+
-+ if (oldPlaylist && newPlaylist) {
-+ const int oldPlaylistSize = oldPlaylist->mediaCount();
-+ for (int i=0; i<oldPlaylistSize; i++) {
-+ newPlaylist->addMedia(oldPlaylist->media(i));
-+ }
-+ } else {
-+ qWarning() << "Failed to sync control playlists since oldPlaylist or newPlaylist is NULL";
-+ }
-+}
-+
-+/*!
- \internal
- If mediaObject is null or doesn't have an intrinsic playlist,
- internal local memory playlist source will be created.
-@@ -170,6 +199,9 @@ bool QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
- if (d->control != newControl) {
- int oldSize = 0;
- if (d->control) {
-+ // Copy playlist items, sync playback mode and sync current index between old control and new control
-+ syncControls(d->control, newControl);
-+
- QMediaPlaylistProvider *playlist = d->control->playlistProvider();
- oldSize = playlist->mediaCount();
- disconnect(playlist, SIGNAL(loadFailed(QMediaPlaylist::Error,QString)),
-diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
-index 1388ac1..b21a7f1 100644
---- a/src/multimedia/playback/qmediaplaylist.h
-+++ b/src/multimedia/playback/qmediaplaylist.h
-@@ -45,6 +45,7 @@
- QT_BEGIN_NAMESPACE
-
-
-+class QMediaPlaylistControl;
- class QMediaPlaylistProvider;
-
- class QMediaPlaylistPrivate;
-@@ -122,6 +123,7 @@ Q_SIGNALS:
- void loadFailed();
-
- protected:
-+ void syncControls(QMediaPlaylistControl *oldControl, QMediaPlaylistControl *newControl);
- bool setMediaObject(QMediaObject *object);
- QMediaPlaylistPrivate *d_ptr;
-
---
-2.5.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 8aa347c..07f426f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@ rpath_nonlinux.diff
skip_failing_tests.patch
# Backported patches
-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
--
qtmultimedia packaging
More information about the pkg-kde-commits
mailing list