From c0126efaae968c48c64880f7b5b309d3fafa6d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 Sep 2017 19:56:14 +0200 Subject: [PATCH] Adjust to pipewire API break --- ...eam-src-Adjust-to-pipewire-API-break.patch | 61 +++++++++++++++++++ mutter.spec | 7 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 0001-screen-cast-stream-src-Adjust-to-pipewire-API-break.patch diff --git a/0001-screen-cast-stream-src-Adjust-to-pipewire-API-break.patch b/0001-screen-cast-stream-src-Adjust-to-pipewire-API-break.patch new file mode 100644 index 0000000..e0716a7 --- /dev/null +++ b/0001-screen-cast-stream-src-Adjust-to-pipewire-API-break.patch @@ -0,0 +1,61 @@ +From 04cfcc5dbe8ffd85966ade88f40b1ed98024e335 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +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?= +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 + diff --git a/mutter.spec b/mutter.spec index feb876a..8f5ebff 100644 --- a/mutter.spec +++ b/mutter.spec @@ -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 - 3.26.0-5 +- Adjust to pipewire API break + * Wed Sep 20 2017 Florian Müllner - 3.26.0-5 - Enable tablet support