rpms
/
mutter
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust to pipewire API break

This commit is contained in:
Florian Müllner 2017-09-20 19:56:14 +02:00
parent fc2bb48ee7
commit c0126efaae
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
0001-screen-cast-stream-src-Adjust-to-pipewire-API-break.patch Normal file
View File

@ -0,0 +1,61 @@
From 04cfcc5dbe8ffd85966ade88f40b1ed98024e335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 20 Sep 2017 19:54:45 +0200
Subject: [PATCH] screen-cast-stream-src: Adjust to pipewire API break
---
src/backends/meta-screen-cast-stream-src.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
index 7f8217712..16c861616 100644
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@@ -535,7 +535,13 @@ meta_screen_cast_stream_src_initable_init (GInitable *initable,
return FALSE;
}
+#if PIPEWIRE_VERSION_MINOR == 4
priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL);
+#elif PIPEWIRE_VERSION_MINOR == 5
+ priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL, 0);
+#else
+ priv->pipewire_remote = NULL;
+#endif
if (!priv->pipewire_remote)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--
2.13.5
From f0c6c4eb1fa2b21e3806a31bbae0f210b029907e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 20 Sep 2017 19:54:45 +0200
Subject: [PATCH] screen-cast-stream-src: Adjust to pipewire API break
https://bugzilla.gnome.org/show_bug.cgi?id=787953
---
src/backends/meta-screen-cast-stream-src.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
index 7f8217712..e6d99d592 100644
--- a/src/backends/meta-screen-cast-stream-src.c
+++ b/src/backends/meta-screen-cast-stream-src.c
@@ -535,7 +535,13 @@ meta_screen_cast_stream_src_initable_init (GInitable *initable,
return FALSE;
}
+#if PIPEWIRE_VERSION_MICRO == 4
priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL);
+#elif PIPEWIRE_VERSION_MICRO >= 5
+ priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL, 0);
+#else
+ priv->pipewire_remote = NULL;
+#endif
if (!priv->pipewire_remote)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
--
2.13.5

7
mutter.spec
View File

@ -7,7 +7,7 @@
Name: mutter
Version: 3.26.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Window and compositing manager based on Clutter
License: GPLv2+
@ -25,6 +25,8 @@ Patch2: mutter-3.26.0-do-not-leak-shortcut-inhibit-data.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=787570
Patch3: mutter-3.26.0-use-gnew0-not-gnew.patch
Patch4: 0001-screen-cast-stream-src-Adjust-to-pipewire-API-break.patch
BuildRequires: chrpath
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
@ -195,6 +197,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/mutter/tests
%changelog
* Wed Sep 21 2017 Florian Müllner <fmuellner@redhat.com> - 3.26.0-5
- Adjust to pipewire API break
* Wed Sep 20 2017 Florian Müllner <fmuellner@redhat.com> - 3.26.0-5
- Enable tablet support