From 61b7bb511a22ee971cefe3f43b34cbb59bbb10d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 18 Aug 2021 02:03:37 +0200 Subject: [PATCH] Update to 41.beta --- .gitignore | 1 + ...-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch | 16 ++++++++-------- mutter.spec | 9 ++++++--- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index a3fe6c8..87c6528 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,4 @@ mutter-2.31.5.tar.bz2 /mutter-40.2.tar.xz /mutter-40.2.1.tar.xz /mutter-40.3.tar.xz +/mutter-41.beta.tar.xz diff --git a/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch index cee9fca..c602c7c 100644 --- a/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch +++ b/0001-Test-deny-atomic-KMS-for-tegra-RHBZ-1936991.patch @@ -1,12 +1,12 @@ -From ac7f1c64e3b12ba74e5138805e334016b40e6629 Mon Sep 17 00:00:00 2001 +From 02d4c01bb9b1b458dcbe10e7be8d2c14df7622da 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 + + data/61-mutter.rules | 1 + + src/backends/native/meta-kms-impl-device-atomic.c | 1 + 2 files changed, 2 insertions(+) diff --git a/data/61-mutter.rules b/data/61-mutter.rules @@ -18,11 +18,11 @@ index edc03e6c1..d8e3c5f00 100644 DRIVERS=="radeon", SUBSYSTEM=="drm", TAG+="mutter-device-disable-kms-modifiers" ENV{ID_PATH}=="platform-vkms", TAG+="mutter-device-ignore" +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 c388096d5..ef65cf82b 100644 ---- a/src/backends/native/meta-kms-device.c -+++ b/src/backends/native/meta-kms-device.c -@@ -252,6 +252,7 @@ is_atomic_allowed (const char *driver_name) +diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/native/meta-kms-impl-device-atomic.c +index 8e41207ee..20b2f8153 100644 +--- a/src/backends/native/meta-kms-impl-device-atomic.c ++++ b/src/backends/native/meta-kms-impl-device-atomic.c +@@ -1122,6 +1122,7 @@ is_atomic_allowed (const char *driver_name) "vmwgfx", "vboxvideo", "nvidia-drm", diff --git a/mutter.spec b/mutter.spec index 91abc3e..a46b8ad 100644 --- a/mutter.spec +++ b/mutter.spec @@ -4,13 +4,13 @@ %global json_glib_version 0.12.0 %global libinput_version 1.4 %global pipewire_version 0.3.0 -%global mutter_api_version 8 +%global mutter_api_version 9 %global tarball_version %%(echo %{version} | tr '~' '.') Name: mutter -Version: 40.3 -Release: 2%{?dist} +Version: 41~beta +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -171,6 +171,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog +* Wed Aug 18 2021 Florian Müllner - 41~beta +- Update to 41.beta + * Thu Jul 22 2021 Fedora Release Engineering - 40.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 0784f94..ea0bf6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutter-40.3.tar.xz) = beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074 +SHA512 (mutter-41.beta.tar.xz) = e0d71ad24e12cbc2e3f40d9301ed68aec83cc02b6767e5bf80472851e6b11dc4dda4ea3efd26169b9494ea089e52bc3615254b5d5eda0f94967689f75c80b055