Hello community,
here is the log from the commit of package xdg-desktop-portal-kde for
openSUSE:Factory checked in at 2018-08-03 12:36:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Fri Aug 3 12:36:06 2018 rev:27 rq:626857 version:5.13.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/xdg-desktop-portal-kde/xdg-desktop-portal-kde.changes
2018-07-12 09:22:42.242715575 +0200
+++
/work/SRC/openSUSE:Factory/.xdg-desktop-portal-kde.new/xdg-desktop-portal-kde.changes
2018-08-03 12:36:34.715505172 +0200
@@ -1,0 +2,11 @@
+Tue Jul 31 15:18:34 CEST 2018 - [email protected]
+
+- Update to 5.13.4
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.13.4.php
+- Changes since 5.13.3:
+ * Minor changes to macros
+ * Support PipeWire 0.2.0
+
+-------------------------------------------------------------------
Old:
----
xdg-desktop-portal-kde-5.13.3.tar.xz
New:
----
xdg-desktop-portal-kde-5.13.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-desktop-portal-kde.spec ++++++
--- /var/tmp/diff_new_pack.BGAPsd/_old 2018-08-03 12:36:35.071505701 +0200
+++ /var/tmp/diff_new_pack.BGAPsd/_new 2018-08-03 12:36:35.071505701 +0200
@@ -25,7 +25,7 @@
%define kf5_version 5.45.0
Name: xdg-desktop-portal-kde
-Version: 5.13.3
+Version: 5.13.4
Release: 0
Summary: QT/KF5 backend for xdg-desktop-portal
License: LGPL-2.1-or-later
++++++ xdg-desktop-portal-kde-5.13.3.tar.xz ->
xdg-desktop-portal-kde-5.13.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.13.3/CMakeLists.txt
new/xdg-desktop-portal-kde-5.13.4/CMakeLists.txt
--- old/xdg-desktop-portal-kde-5.13.3/CMakeLists.txt 2018-07-10
12:18:44.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/CMakeLists.txt 2018-07-31
15:04:53.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.3")
+set(PROJECT_VERSION "5.13.4")
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.3/po/da/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.4/po/da/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.3/po/da/xdg-desktop-portal-kde.po
2018-07-10 12:18:40.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/po/da/xdg-desktop-portal-kde.po
2018-07-31 15:04:36.000000000 +0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Martin Schlander <[email protected]>, 2017.
+# Martin Schlander <[email protected]>, 2017, 2018.
msgid ""
msgstr ""
"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: 2017-11-27 19:39+0100\n"
+"PO-Revision-Date: 2018-07-18 20:30+0100\n"
"Last-Translator: Martin Schlander <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
"Language: da\n"
@@ -52,12 +52,14 @@
"href=#discover><span style=\"text-decoration: underline\">Discover</span></"
"a>."
msgstr ""
+"Vælg programmet der skal åbne \"%1\". Andre programmer er tilgængelige i <a "
+"href=#discover><span style=\"text-decoration: underline\">Discover</span></"
+"a>."
#: src/appchooserdialog.cpp:105
-#, fuzzy, kde-format
-#| msgid "Open"
+#, kde-format
msgid "Open with"
-msgstr "Åbn"
+msgstr "Åbn med"
#: src/filechooser.cpp:159
#, kde-format
@@ -70,6 +72,8 @@
"Laptop screen\n"
"Model: %1"
msgstr ""
+"Bærbarskærm\n"
+"Model: %1"
#: src/screenchooserdialog.cpp:48 src/screenchooserdialog.cpp:51
#, kde-format
@@ -77,85 +81,86 @@
"Manufacturer: %1\n"
"Model: %2"
msgstr ""
+"Producent: %1\n"
+"Model: %2"
#: src/screenchooserdialog.cpp:65
#, kde-format
msgid "Share"
-msgstr ""
+msgstr "Del"
#: src/screenchooserdialog.cpp:66
#, kde-format
msgid "Select screen to share"
-msgstr ""
+msgstr "Vælg skærm der skal deles"
#: src/screenshotdialog.cpp:95
-#, fuzzy, kde-format
-#| msgid "Request device access"
+#, kde-format
msgid "Request screenshot"
-msgstr "Anmod om adgang til enhed"
+msgstr "Anmod om skærmbillede"
#. i18n: ectx: property (text), widget (QLabel, label)
#: src/screenshotdialog.ui:26
#, kde-format
msgid "<b>Capture Mode</b>"
-msgstr ""
+msgstr "<b>Indfangningstilstand</b>"
#. i18n: ectx: property (text), widget (QLabel, label_3)
#: src/screenshotdialog.ui:41
#, kde-format
msgid "Area:"
-msgstr ""
+msgstr "Område:"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:58
#, kde-format
msgid "Full Screen (All Monitors)"
-msgstr ""
+msgstr "Fuldskærm (alle skærme)"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:63
#, kde-format
msgid "Current Screen"
-msgstr ""
+msgstr "Nuværende skærm"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:68
#, kde-format
msgid "Active Window"
-msgstr ""
+msgstr "Aktivt vindue"
#. i18n: ectx: property (text), widget (QLabel, label_4)
#: src/screenshotdialog.ui:82
#, kde-format
msgid "Delay:"
-msgstr ""
+msgstr "Forsinkelse:"
#. i18n: ectx: property (specialValueText), widget (QSpinBox, delaySpinBox)
#: src/screenshotdialog.ui:98
#, kde-format
msgid "No Delay"
-msgstr ""
+msgstr "Ingen forsinkelse"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: src/screenshotdialog.ui:110
#, kde-format
msgid "<b>Content Options</b>"
-msgstr ""
+msgstr "<b>Indstillinger for indhold</b>"
#. i18n: ectx: property (text), widget (QCheckBox, includeCursorCheckbox)
#: src/screenshotdialog.ui:117
#, kde-format
msgid "Include mouse pointer"
-msgstr ""
+msgstr "Medtag musemarkør"
#. i18n: ectx: property (text), widget (QCheckBox, includeBordersCheckbox)
#: src/screenshotdialog.ui:127
#, kde-format
msgid "Include window borders"
-msgstr ""
+msgstr "Medtag vinduers titellinje og kanter"
#. i18n: ectx: property (text), widget (QPushButton, takeScreenshotButton)
#: src/screenshotdialog.ui:164
#, kde-format
msgid "Take screenshot"
-msgstr ""
\ No newline at end of file
+msgstr "Tag skærmbillede"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.3/po/fi/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.4/po/fi/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.3/po/fi/xdg-desktop-portal-kde.po
2018-07-10 12:18:40.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/po/fi/xdg-desktop-portal-kde.po
2018-07-31 15:04:38.000000000 +0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Tommi Nieminen <[email protected]>, 2017.
+# Tommi Nieminen <[email protected]>, 2017, 2018.
#
msgid ""
msgstr ""
"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: 2017-06-08 21:34+0200\n"
+"PO-Revision-Date: 2018-07-10 23:04+0200\n"
"Last-Translator: Tommi Nieminen <[email protected]>\n"
"Language-Team: Finnish <[email protected]>\n"
"Language: fi\n"
@@ -52,12 +52,14 @@
"href=#discover><span style=\"text-decoration: underline\">Discover</span></"
"a>."
msgstr ""
+"Valitse sovellus, jolla ”%1” avataan. Muita sovelluksia on saatavilla <a "
+"href=#discover><span style=\"text-decoration: underline\">Discover</span></"
+"a>issa."
#: src/appchooserdialog.cpp:105
-#, fuzzy, kde-format
-#| msgid "Open"
+#, kde-format
msgid "Open with"
-msgstr "Avaa"
+msgstr "Avaa ohjelmalla"
#: src/filechooser.cpp:159
#, kde-format
@@ -70,6 +72,8 @@
"Laptop screen\n"
"Model: %1"
msgstr ""
+"Kannettavan näyttö\n"
+"Malli: %1"
#: src/screenchooserdialog.cpp:48 src/screenchooserdialog.cpp:51
#, kde-format
@@ -77,85 +81,86 @@
"Manufacturer: %1\n"
"Model: %2"
msgstr ""
+"Valmistaja: %1\n"
+"Malli: %2"
#: src/screenchooserdialog.cpp:65
#, kde-format
msgid "Share"
-msgstr ""
+msgstr "Jaa"
#: src/screenchooserdialog.cpp:66
#, kde-format
msgid "Select screen to share"
-msgstr ""
+msgstr "Valitse jaettava näyttö"
#: src/screenshotdialog.cpp:95
-#, fuzzy, kde-format
-#| msgid "Request device access"
+#, kde-format
msgid "Request screenshot"
-msgstr "Pyydä laiteyhteyttä"
+msgstr "Pyydä kuvakaappausta"
#. i18n: ectx: property (text), widget (QLabel, label)
#: src/screenshotdialog.ui:26
#, kde-format
msgid "<b>Capture Mode</b>"
-msgstr ""
+msgstr "<b>Kaappaustapa</b>"
#. i18n: ectx: property (text), widget (QLabel, label_3)
#: src/screenshotdialog.ui:41
#, kde-format
msgid "Area:"
-msgstr ""
+msgstr "Alue:"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:58
#, kde-format
msgid "Full Screen (All Monitors)"
-msgstr ""
+msgstr "Koko näyttö (kaikki näytöt)"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:63
#, kde-format
msgid "Current Screen"
-msgstr ""
+msgstr "Nykyinen näyttö"
#. i18n: ectx: property (text), item, widget (QComboBox, areaComboBox)
#: src/screenshotdialog.ui:68
#, kde-format
msgid "Active Window"
-msgstr ""
+msgstr "Aktiivinen ikkuna"
#. i18n: ectx: property (text), widget (QLabel, label_4)
#: src/screenshotdialog.ui:82
#, kde-format
msgid "Delay:"
-msgstr ""
+msgstr "Viive:"
#. i18n: ectx: property (specialValueText), widget (QSpinBox, delaySpinBox)
#: src/screenshotdialog.ui:98
#, kde-format
msgid "No Delay"
-msgstr ""
+msgstr "Ei viivettä"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: src/screenshotdialog.ui:110
#, kde-format
msgid "<b>Content Options</b>"
-msgstr ""
+msgstr "<b>Sisältövalinnat</b>"
#. i18n: ectx: property (text), widget (QCheckBox, includeCursorCheckbox)
#: src/screenshotdialog.ui:117
#, kde-format
msgid "Include mouse pointer"
-msgstr ""
+msgstr "Ota hiirikohdistin mukaan"
#. i18n: ectx: property (text), widget (QCheckBox, includeBordersCheckbox)
#: src/screenshotdialog.ui:127
#, kde-format
msgid "Include window borders"
-msgstr ""
+msgstr "Ota ikkunareunat mukaan"
#. i18n: ectx: property (text), widget (QPushButton, takeScreenshotButton)
#: src/screenshotdialog.ui:164
#, kde-format
msgid "Take screenshot"
-msgstr ""
\ No newline at end of file
+msgstr "Ota kuvakaappaus"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.3/po/nn/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.4/po/nn/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.3/po/nn/xdg-desktop-portal-kde.po
2018-07-10 12:18:42.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/po/nn/xdg-desktop-portal-kde.po
2018-07-31 15:04:46.000000000 +0200
@@ -16,6 +16,9 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 2.0\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
#: src/accessdialog.cpp:42
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xdg-desktop-portal-kde-5.13.3/po/zh_CN/xdg-desktop-portal-kde.po
new/xdg-desktop-portal-kde-5.13.4/po/zh_CN/xdg-desktop-portal-kde.po
--- old/xdg-desktop-portal-kde-5.13.3/po/zh_CN/xdg-desktop-portal-kde.po
2018-07-10 12:18:44.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/po/zh_CN/xdg-desktop-portal-kde.po
2018-07-31 15:04:53.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-07-03 17:39\n"
+"PO-Revision-Date: 2018-07-24 08:45\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.3/src/screencaststream.cpp
new/xdg-desktop-portal-kde-5.13.4/src/screencaststream.cpp
--- old/xdg-desktop-portal-kde-5.13.3/src/screencaststream.cpp 2018-07-10
12:18:37.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/src/screencaststream.cpp 2018-07-31
15:04:22.000000000 +0200
@@ -193,7 +193,11 @@
}
}
+#if defined(PW_API_PRE_0_2_0)
static void onStreamFormatChanged(void *data, struct spa_pod *format)
+#else
+static void onStreamFormatChanged(void *data, const struct spa_pod *format)
+#endif // defined(PW_API_PRE_0_2_0)
{
qCDebug(XdgDesktopPortalKdeScreenCastStream) << "Stream format changed";
@@ -202,7 +206,11 @@
uint8_t paramsBuffer[1024];
int32_t width, height, stride, size;
struct spa_pod_builder pod_builder;
+#if defined(PW_API_PRE_0_2_0)
struct spa_pod *params[1];
+#else
+ const struct spa_pod *params[1];
+#endif // defined(PW_API_PRE_0_2_0)
const int bpp = 4;
if (!format) {
@@ -245,13 +253,17 @@
.format_changed = onStreamFormatChanged,
.add_buffer = nullptr,
.remove_buffer = nullptr,
+#if defined(PW_API_PRE_0_2_0)
.new_buffer = nullptr,
.need_buffer = nullptr,
+#else
+ .process = nullptr,
+#endif // defined(PW_API_PRE_0_2_0)
};
ScreenCastStream::ScreenCastStream(const QSize &resolution, QObject *parent)
- : resolution(resolution)
- , QObject(parent)
+ : QObject(parent)
+ , resolution(resolution)
{
}
@@ -337,7 +349,6 @@
int height = resolution.height();
spa_fraction paramFraction = SPA_FRACTION(0, 1);
- 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,
@@ -350,7 +361,11 @@
pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this);
+#if defined(PW_API_PRE_0_2_0)
if (pw_stream_connect(pwStream, PW_DIRECTION_OUTPUT, nullptr,
PW_STREAM_FLAG_NONE, params, G_N_ELEMENTS(¶ms)) != 0) {
+#else
+ if (pw_stream_connect(pwStream, PW_DIRECTION_OUTPUT, nullptr,
static_cast<pw_stream_flags>(PW_STREAM_FLAG_DRIVER |
PW_STREAM_FLAG_MAP_BUFFERS), params, G_N_ELEMENTS(¶ms)) != 0) {
+#endif // defined(PW_API_PRE_0_2_0)
qCWarning(XdgDesktopPortalKdeScreenCastStream) << "Could not connect
to stream";
return false;
}
@@ -360,8 +375,12 @@
bool ScreenCastStream::recordFrame(uint8_t *screenData)
{
+#if defined(PW_API_PRE_0_2_0)
uint32_t bufferId;
- struct spa_buffer *buffer;
+#else
+ struct pw_buffer *buffer;
+#endif // defined(PW_API_PRE_0_2_0)
+ struct spa_buffer *spa_buffer;
uint8_t *map = nullptr;
uint8_t *data = nullptr;
@@ -371,6 +390,7 @@
return false;
}
+#if defined(PW_API_PRE_0_2_0)
bufferId = pw_stream_get_empty_buffer(pwStream);
if (bufferId == SPA_ID_INVALID) {
@@ -378,19 +398,31 @@
return false;
}
- buffer = pw_stream_peek_buffer(pwStream, bufferId);
-
- if (buffer->datas[0].type == pwCoreType->data.MemFd) {
- map = (uint8_t *)mmap(nullptr, buffer->datas[0].maxsize +
buffer->datas[0].mapoffset, PROT_READ | PROT_WRITE, MAP_SHARED,
buffer->datas[0].fd, 0);
+ spa_buffer = pw_stream_peek_buffer(pwStream, bufferId);
+#else
+ buffer = pw_stream_dequeue_buffer(pwStream);
+#endif // defined(PW_API_PRE_0_2_0)
+
+#if defined(PW_API_PRE_0_2_0)
+ if (spa_buffer->datas[0].type == pwCoreType->data.MemFd) {
+#else
+ spa_buffer = buffer->buffer;
+
+ if (spa_buffer->datas[0].data) {
+ data = (uint8_t *) spa_buffer->datas[0].data;
+ } else if (spa_buffer->datas[0].type == pwCoreType->data.MemFd) {
+#endif // defined(PW_API_PRE_0_2_0)
+ map = (uint8_t *)mmap(nullptr, spa_buffer->datas[0].maxsize +
spa_buffer->datas[0].mapoffset, PROT_READ | PROT_WRITE, MAP_SHARED,
spa_buffer->datas[0].fd, 0);
if (map == MAP_FAILED) {
qCWarning(XdgDesktopPortalKdeScreenCastStream) << "Failed to mmap
pipewire stream buffer: " << strerror(errno);
return false;
}
-
- data = SPA_MEMBER(map, buffer->datas[0].mapoffset, uint8_t);
- } else if (buffer->datas[0].type == pwCoreType->data.MemPtr) {
- data = (uint8_t *) buffer->datas[0].data;
+ data = SPA_MEMBER(map, spa_buffer->datas[0].mapoffset, uint8_t);
+#if defined(PW_API_PRE_0_2_0)
+ } else if (spa_buffer->datas[0].type == pwCoreType->data.MemPtr) {
+ data = (uint8_t *) spa_buffer->datas[0].data;
+#endif // defined(PW_API_PRE_0_2_0)
} else {
return false;
}
@@ -398,13 +430,16 @@
memcpy(data, screenData, BITS_PER_PIXEL * videoFormat.size.height *
videoFormat.size.width * sizeof(uint8_t));
if (map) {
- munmap(map, buffer->datas[0].maxsize + buffer->datas[0].mapoffset);
+ munmap(map, spa_buffer->datas[0].maxsize +
spa_buffer->datas[0].mapoffset);
}
- buffer->datas[0].chunk->size = buffer->datas[0].maxsize;
+ spa_buffer->datas[0].chunk->size = spa_buffer->datas[0].maxsize;
+#if defined(PW_API_PRE_0_2_0)
pw_stream_send_buffer(pwStream, bufferId);
-
+#else
+ pw_stream_queue_buffer(pwStream, buffer);
+#endif // defined(PW_API_PRE_0_2_0)
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xdg-desktop-portal-kde-5.13.3/src/screencaststream.h
new/xdg-desktop-portal-kde-5.13.4/src/screencaststream.h
--- old/xdg-desktop-portal-kde-5.13.3/src/screencaststream.h 2018-07-10
12:18:37.000000000 +0200
+++ new/xdg-desktop-portal-kde-5.13.4/src/screencaststream.h 2018-07-31
15:04:22.000000000 +0200
@@ -39,6 +39,16 @@
#include <pipewire/remote.h>
#include <pipewire/stream.h>
+#ifdef __has_include
+ #if __has_include(<pipewire/version.h>)
+ #include<pipewire/version.h>
+ #else
+ #define PW_API_PRE_0_2_0
+ #endif // __has_include(<pipewire/version.h>)
+#else
+ #define PW_API_PRE_0_2_0
+#endif // __has_include
+
class PwType {
public:
spa_type_media_type media_type;
