Hello community,
here is the log from the commit of package xdg-desktop-portal-kde for
openSUSE:Factory checked in at 2018-06-28 15:12:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-desktop-portal-kde (Old)
and /work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-desktop-portal-kde"
Thu Jun 28 15:12:42 2018 rev:24 rq:619332 version:5.13.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/xdg-desktop-portal-kde/xdg-desktop-portal-kde.changes
2018-06-20 15:36:57.961863240 +0200
+++
/work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new/xdg-desktop-portal-kde.changes
2018-06-28 15:13:08.963622539 +0200
@@ -1,0 +2,10 @@
+Tue Jun 26 16:01:37 CEST 2018 - [email protected]
+
+- Update to 5.13.2
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.13.2.php
+- Changes since 5.13.1:
+ * Stop streaming when session is closed and allow some stream negotiation
+
+-------------------------------------------------------------------
Old:
----
xdg-desktop-portal-kde-5.13.1.tar.xz
New:
----
xdg-desktop-portal-kde-5.13.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-desktop-portal-kde.spec ++++++
--- /var/tmp/diff_new_pack.ugFdFn/_old 2018-06-28 15:13:09.563621439 +0200
+++ /var/tmp/diff_new_pack.ugFdFn/_new 2018-06-28 15:13:09.563621439 +0200
@@ -22,7 +22,7 @@
%define kf5_version 5.45.0
Name: xdg-desktop-portal-kde
-Version: 5.13.1
+Version: 5.13.2
Release: 0
Summary: QT/KF5 backend for xdg-desktop-portal
License: LGPL-2.1-or-later
++++++ xdg-desktop-portal-kde-5.13.1.tar.xz ->
xdg-desktop-portal-kde-5.13.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.13.1/CMakeLists.txt
new/xdg-desktop-portal-kde-5.13.2/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.13.1/CMakeLists.txt 2018-06-19
12:53:26.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/CMakeLists.txt 2018-06-26
14:01:55.000000000 +0200
@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-set(PROJECT_VERSION "5.13.1")
+set(PROJECT_VERSION "5.13.2")
set(PROJECT_VERSION_MAJOR 5)
################# set KDE specific information #################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.1/po/ca/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.2/po/ca/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.1/po/ca/xdg-desktop-portal-kde.po
2018-06-19 12:53:09.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/po/ca/xdg-desktop-portal-kde.po
2018-06-26 14:01:37.000000000 +0200
@@ -4,13 +4,14 @@
# version 3 or later versions approved by the membership of KDE e.V.
#
# Josep Ma. Ferrer <[email protected]>, 2017, 2018.
+# Antoni Bella Pérez <[email protected]>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: xdg-desktop-portal-kde\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2018-05-05 03:41+0200\n"
-"PO-Revision-Date: 2018-05-05 10:32+0100\n"
-"Last-Translator: Josep Ma. Ferrer <[email protected]>\n"
+"PO-Revision-Date: 2018-06-23 17:40+0100\n"
+"Last-Translator: Antoni Bella Pérez <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -55,7 +56,7 @@
"href=#discover><span style=\"text-decoration: underline\">Discover</span></"
"a>."
msgstr ""
-"Seleccioneu l'aplicació per obrir «%1». Hi ha altres aplicacions disponibles "
+"Seleccioneu l'aplicació per obrir «%1». Hi ha disponibles altres aplicacions "
"al <a href=#discover><span style=\"text-decoration: underline\">Discover</"
"span></a>."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.1/po/ca@valencia/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.2/po/ca@valencia/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.1/po/ca@valencia/xdg-desktop-portal-kde.po
2018-06-19 12:53:09.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/po/ca@valencia/xdg-desktop-portal-kde.po
2018-06-26 14:01:37.000000000 +0200
@@ -4,13 +4,14 @@
# version 3 or later versions approved by the membership of KDE e.V.
#
# Josep Ma. Ferrer <[email protected]>, 2017, 2018.
+# Antoni Bella Pérez <[email protected]>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: xdg-desktop-portal-kde\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2018-05-05 03:41+0200\n"
-"PO-Revision-Date: 2018-05-05 10:32+0100\n"
-"Last-Translator: Josep Ma. Ferrer <[email protected]>\n"
+"PO-Revision-Date: 2018-06-23 17:40+0100\n"
+"Last-Translator: Antoni Bella Pérez <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
@@ -55,7 +56,7 @@
"href=#discover><span style=\"text-decoration: underline\">Discover</span></"
"a>."
msgstr ""
-"Seleccioneu l'aplicació per obrir «%1». Hi ha altres aplicacions disponibles "
+"Seleccioneu l'aplicació per obrir «%1». Hi ha disponibles altres aplicacions "
"al <a href=#discover><span style=\"text-decoration: underline\">Discover</"
"span></a>."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.1/po/de/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.2/po/de/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.1/po/de/xdg-desktop-portal-kde.po
2018-06-19 12:53:10.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/po/de/xdg-desktop-portal-kde.po
2018-06-26 14:01:38.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2018-05-05 03:41+0200\n"
-"PO-Revision-Date: 2018-04-30 13:23+0100\n"
+"PO-Revision-Date: 2018-06-25 06:17+0100\n"
"Last-Translator: Burkhard Lück <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"Language: de\n"
@@ -76,6 +76,8 @@
"Manufacturer: %1\n"
"Model: %2"
msgstr ""
+"Hersteller: %1\n"
+"Model: %2"
#: src/screenchooserdialog.cpp:65
#, kde-format
@@ -88,73 +90,72 @@
msgstr ""
#: src/screenshotdialog.cpp:95
-#, fuzzy, kde-format
-#| msgid "Request device access"
+#, kde-format
msgid "Request screenshot"
-msgstr "Gerätezugriff anfordern"
+msgstr "Bildschirmfoto anfordern"
#. i18n: ectx: property (text), widget (QLabel, label)
#: src/screenshotdialog.ui:26
#, kde-format
msgid "<b>Capture Mode</b>"
-msgstr ""
+msgstr "<b>Aufnahmemodus</b>"
#. i18n: ectx: property (text), widget (QLabel, label_3)
#: src/screenshotdialog.ui:41
#, kde-format
msgid "Area:"
-msgstr ""
+msgstr "Bereich:"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:58
#, kde-format
msgid "Full Screen (All Monitors)"
-msgstr ""
+msgstr "Vollbild (Alle Monitore)"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:63
#, kde-format
msgid "Current Screen"
-msgstr ""
+msgstr "Aktueller Bildschirm"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:68
#, kde-format
msgid "Active Window"
-msgstr ""
+msgstr "Aktives Fenster"
#. i18n: ectx: property (text), widget (QLabel, label_4)
#: src/screenshotdialog.ui:82
#, kde-format
msgid "Delay:"
-msgstr ""
+msgstr "Verzögerung:"
#. i18n: ectx: property (specialValueText), widget (QSpinBox, delaySpinBox)
#: src/screenshotdialog.ui:98
#, kde-format
msgid "No Delay"
-msgstr ""
+msgstr "Keine Verzögerung"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: src/screenshotdialog.ui:110
#, kde-format
msgid "<b>Content Options</b>"
-msgstr ""
+msgstr "<b>Aufnahme-Einstellungen</b>"
#. i18n: ectx: property (text), widget (QCheckBox, includeCursorCheckbox)
#: src/screenshotdialog.ui:117
#, kde-format
msgid "Include mouse pointer"
-msgstr ""
+msgstr "Mauszeiger einbeziehen"
#. i18n: ectx: property (text), widget (QCheckBox, includeBordersCheckbox)
#: src/screenshotdialog.ui:127
#, kde-format
msgid "Include window borders"
-msgstr ""
+msgstr "Fensterränder einbeziehen"
#. i18n: ectx: property (text), widget (QPushButton, takeScreenshotButton)
#: src/screenshotdialog.ui:164
#, kde-format
msgid "Take screenshot"
-msgstr ""
\ No newline at end of file
+msgstr "Bildschirmfoto aufnehmen"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.1/po/zh_CN/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.2/po/zh_CN/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.1/po/zh_CN/xdg-desktop-portal-kde.po
2018-06-19 12:53:26.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/po/zh_CN/xdg-desktop-portal-kde.po
2018-06-26 14:01:55.000000000 +0200
@@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2018-05-05 03:41+0200\n"
-"PO-Revision-Date: 2018-06-12 17:52-0400\n"
+"PO-Revision-Date: 2018-06-19T17:12:48+0000\n"
"Last-Translator: guoyunhebrave <[email protected]>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.13.1/src/screencast.cpp
new/xdg-desktop-portal-kde-5.13.2/src/screencast.cpp
--- old/xdg-desktop-portal-kde-5.13.1/src/screencast.cpp 2018-06-19
12:52:56.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/src/screencast.cpp 2018-06-26
14:01:23.000000000 +0200
@@ -244,19 +244,7 @@
}
});
- connect(m_stream, &ScreenCastStream::stopStreaming, this, [this] {
- if (m_streamingEnabled) {
- qCDebug(XdgDesktopPortalKdeScreenCast) << "Stop streaming";
- m_remoteAccessManager->release();
- m_remoteAccessManager->destroy();
-
- m_streamingEnabled = false;
- m_stream->removeStream();
-
- qDeleteAll(m_bindOutputs);
- m_bindOutputs.clear();
- }
- });
+ connect(m_stream, &ScreenCastStream::stopStreaming, this,
&ScreenCastPortal::stopStreaming);
}
void ScreenCastPortal::initWayland()
@@ -315,6 +303,7 @@
m_sessionList.remove(session_handle.path());
QDBusConnection::sessionBus().unregisterObject(session_handle.path());
session->deleteLater();
+ stopStreaming();
});
m_sessionList.insert(session_handle.path(), session);
return 0;
@@ -417,6 +406,8 @@
QTimer::singleShot(3000, &loop, &QEventLoop::quit);
loop.exec();
+ disconnect(m_stream, &ScreenCastStream::streamReady, this, nullptr);
+
if (!streamReady) {
qCWarning(XdgDesktopPortalKdeScreenCast) << "Pipewire stream is
not ready to be streamed";
return 2;
@@ -571,3 +562,18 @@
m_registry->setEventQueue(m_queue);
m_registry->setup();
}
+
+void ScreenCastPortal::stopStreaming()
+{
+ if (m_streamingEnabled) {
+ qCDebug(XdgDesktopPortalKdeScreenCast) << "Stop streaming";
+ m_remoteAccessManager->release();
+ m_remoteAccessManager->destroy();
+
+ m_streamingEnabled = false;
+ m_stream->removeStream();
+
+ qDeleteAll(m_bindOutputs);
+ m_bindOutputs.clear();
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.13.1/src/screencast.h
new/xdg-desktop-portal-kde-5.13.2/src/screencast.h
--- old/xdg-desktop-portal-kde-5.13.1/src/screencast.h 2018-06-19
12:52:56.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/src/screencast.h 2018-06-26
14:01:23.000000000 +0200
@@ -120,6 +120,7 @@
void removeOutput(quint32 name);
void processBuffer(const KWayland::Client::RemoteBuffer *rbuf);
void setupRegistry();
+ void stopStreaming();
private:
void initDrm();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.1/src/screencaststream.cpp
new/xdg-desktop-portal-kde-5.13.2/src/screencaststream.cpp
--- old/xdg-desktop-portal-kde-5.13.1/src/screencaststream.cpp 2018-06-19
12:52:56.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.2/src/screencaststream.cpp 2018-06-26
14:01:23.000000000 +0200
@@ -256,6 +256,14 @@
delete pwType;
}
+ if (pwStream) {
+ pw_stream_destroy(pwStream);
+ }
+
+ if (pwRemote) {
+ pw_remote_destroy(pwRemote);
+ }
+
if (pwCore) {
pw_core_destroy(pwCore);
}
@@ -319,17 +327,21 @@
minFramerate = SPA_FRACTION(1, 1);
maxFramerate = SPA_FRACTION((uint32_t)fraction.num,
(uint32_t)fraction.denom);
+ spa_rectangle minResolution = SPA_RECTANGLE(1, 1);
+ int width = resolution.width();
+ int height = resolution.height();
+
spa_fraction paramFraction = SPA_FRACTION(0, 1);
- spa_rectangle paramRectangle = SPA_RECTANGLE((uint32_t)resolution.width(),
(uint32_t)resolution.height());
+ spa_rectangle paramRectangle = SPA_RECTANGLE((uint32_t)width,
(uint32_t)height);
params[0] = (spa_pod*)spa_pod_builder_object(&podBuilder,
pwCoreType->param.idEnumFormat,
pwCoreType->spa_format,
"I", pwType->media_type.video,
"I", pwType->media_subtype.raw,
":", pwType->format_video.format, "I",
pwType->video_format.RGBx,
- ":", pwType->format_video.size, "R",
¶mRectangle,
+ ":", pwType->format_video.size, "Rru",
&minResolution, SPA_POD_PROP_MIN_MAX(&width, &height),
":", pwType->format_video.framerate,
"F", ¶mFraction,
- ":",
pwType->format_video.max_framerate, "Fr", &maxFramerate, PROP_RANGE
(&minFramerate, &maxFramerate));
+ ":",
pwType->format_video.max_framerate, "Fru", &maxFramerate, PROP_RANGE
(&minFramerate, &maxFramerate));
pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this);
@@ -393,8 +405,10 @@
void ScreenCastStream::removeStream()
{
- pw_stream_destroy(pwStream);
- pwStream = nullptr;
+ // FIXME destroying streams seems to be crashing, Mutter also doesn't
remove them, maybe Pipewire does this automatically
+ // pw_stream_destroy(pwStream);
+ // pwStream = nullptr;
+ pw_stream_disconnect(pwStream);
}
void ScreenCastStream::initializePwTypes()
