From 7e2065ea35a4ec812374d99e1c52a65ccc28ef21 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 12 Mar 2021 00:50:38 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mutter.git#9a4f3cee975dd915c30581b5d8247b1ccaa374fd --- ...not-provide-built-sources-as-libmutt.patch | 26 +++++++++++++++ ...ny-atomic-KMS-for-tegra-RHBZ-1936991.patch | 33 +++++++++++++++++++ mutter.spec | 12 ++++++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch create mode 100644 0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch diff --git a/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch b/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch new file mode 100644 index 0000000..bd18e8a --- /dev/null +++ b/0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch @@ -0,0 +1,26 @@ +From 3899a01cd6cb00ca686946d3065d58f59f5c2099 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Tue, 17 Nov 2020 14:00:02 +0100 +Subject: [PATCH] Revert "build: Do not provide built sources as libmutter_dep + sources" + +This reverts commit 4e9a2e479969973bf3063c740ceff149036b3af4. +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index e7c99caee..8fe484ec2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name, + libmutter_dep = declare_dependency( + link_with: libmutter, + include_directories: mutter_includes, ++ sources: mutter_built_sources, + dependencies: [ + libmutter_cogl_dep, + libmutter_clutter_dep, +-- +2.28.0 + diff --git a/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch new file mode 100644 index 0000000..be3f2dc --- /dev/null +++ b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch @@ -0,0 +1,33 @@ +From fdd8a6f6760034707428554f50c09db2c5f2efcb Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Tue, 9 Mar 2021 17:21:59 -0800 +Subject: [PATCH] Test: deny atomic KMS for "tegra" (RHBZ #1936991) + +Signed-off-by: Adam Williamson +--- + data/61-mutter.rules | 1 + + src/backends/native/meta-kms-device.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/data/61-mutter.rules b/data/61-mutter.rules +index 59cc00007c..f04e536f80 100644 +--- a/data/61-mutter.rules ++++ b/data/61-mutter.rules +@@ -1 +1,2 @@ + DRIVER=="tegra-host1x", SUBSYSTEM=="platform", TAG+="mutter-device-requires-kms-modifiers" ++DRIVER=="tegra", SUBSYSTEM=="platform", TAG+="mutter-device-disable-atomic-kms" +diff --git a/src/backends/native/meta-kms-device.c b/src/backends/native/meta-kms-device.c +index b5b50d602c..f86ca2ab56 100644 +--- a/src/backends/native/meta-kms-device.c ++++ b/src/backends/native/meta-kms-device.c +@@ -246,6 +246,7 @@ is_atomic_allowed (const char *driver_name) + "vmwgfx", + "vboxvideo", + "nvidia-drm", ++ "tegra", + NULL, + }; + +-- +2.30.1 + diff --git a/mutter.spec b/mutter.spec index f358e50..a2a05c0 100644 --- a/mutter.spec +++ b/mutter.spec @@ -8,7 +8,7 @@ Name: mutter Version: 40.0~beta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -19,6 +19,12 @@ Source0: http://download.gnome.org/sources/%{name}/40/%{name}-40.beta.tar. # Work-around for OpenJDK's compliance test Patch0: 0001-window-actor-Special-case-shaped-Java-windows.patch +# To make s390x build pass +Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch + +# Workaround for RHBZ#1936991 (blocks atomic KMS on "tegra" driver) +Patch2: 0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch + BuildRequires: chrpath BuildRequires: pango-devel BuildRequires: startup-notification-devel @@ -52,6 +58,7 @@ BuildRequires: pkgconfig(graphene-gobject-1.0) BuildRequires: pam-devel BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version} BuildRequires: pkgconfig(sysprof-capture-4) +BuildRequires: sysprof-devel BuildRequires: systemd-devel BuildRequires: upower-devel BuildRequires: xorg-x11-server-Xorg @@ -164,6 +171,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog +* Tue Mar 09 2021 Adam Williamson - 40.0~beta-2 +- Add a workaround for RHBZ#1936991 (disable atomic KMS on tegra) + * Mon Feb 22 2021 Florian Müllner - 40.0~beta-1 - Update to 40.beta