gentoo auto-resync : 07:09:2022 - 04:34:29

3 files changed, 83 insertions, 2 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index a090fb1d9ce2..821eaf2eae4c 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,6 +1,7 @@
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
+AUX mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch 3102 BLAKE2B 8adfd306044014776bdfe46bcc45f1333af2ae5ee7ab195fed0c6f1f852723670f90aa0fd7476bd59f0b1c76a4b91521f3a19f9ba0f584f4699075b484aa0dfc SHA512 e751600b5f82ae1330f888c891f302c107fd5da1227392774e8ef2aa681c528be28c78ffd64f832e8aaf31179eeecc12575bc34e3d80d2ab638f3aae099c8cbf
 DIST mutter-42.3.tar.xz 2746756 BLAKE2B 818b2ac8cd264c6b8e30b6731ef2641dbcbba6dce7628d0a934c3f49a5857874d9e6a97cd53ec689c2a9ae7f52d49ed98b7cc551eafbb32b74cbebbe027d9f43 SHA512 f346d2299143ceb6c9164977df2e23655b1c204f3a2d1f713377f3cc2f3609c56914c5e8a0b940d4fdd3d040a9af210f724350bb4f74ffac293e6a82e2b0785b
 DIST mutter-42.4.tar.xz 2747580 BLAKE2B 8627e1de8ea93498ff0abd0605836c5b70bb9e51e50ade93b6dd332393892c167aa0cc58f45621e9838ea885834d915ecf2c75c8493fbd154930d4c7427c1010 SHA512 fad80c2c3e6674c00e35783c69886ed728c732743ec967756329c5fd3dd7c1b5695aa0dca7e5d8a3bcb72d03ec06bbdc45c14cc775d40db2852b2299c8b0df03
 EBUILD mutter-42.3.ebuild 5486 BLAKE2B 7969cc68ae159ee63076c9947054fca8b628dc32f166611cf20d2cd7f9f5e3fc2144f0b3046a0e5bc74fb5912f03760f9cab0a8ca770c4eaffcc3d27af5c7223 SHA512 17040b8714373e0947575ea133b45a5c1c7b621ead36039816c3d573310b42b68d0dc7cc12f4e2115e61de5d99eb6661bc01a92f22632b09c65f1ec3ceb2f8ab
-EBUILD mutter-42.4.ebuild 5433 BLAKE2B 87e13e3450dc0d7476e52e2c85cfd1e78df5e6343f6cc0a608c0a66a9d889a5ca6807f9eee55c25417326269e4da22d85e62a4bb60e8a63d48c3a8b4de11cfeb SHA512 e81b4437cc45bfa8e58ebf3b487c359425c4b478369e4c2945c9a38ca9c79c2f408b795591b91db042b60ca6dde42dca8792a1b55b50ddf3d5c1ec3c33e69bb4
+EBUILD mutter-42.4-r1.ebuild 5464 BLAKE2B a57bf0a383c50b526bc20f6f2ba38e8a73e64908e57df6ce47af3c54c8426de8e648a253a38b1ca9966463bbc88e8cad5202cd70bcf5edd121334106a075adc8 SHA512 f5f2e8a741fb5ca3ca35a32b21ab65fa41c7293d2d8b807ca7830f34a73dba0e73f0647dfc8d590c9e1a26da8de84a5d1df46df095e2fc5c3435507611af3a3d
 MISC metadata.xml 485 BLAKE2B c44b289cf5592b16abd0d7a095e2c042550d6bc37a3ab8a0ac287a9c501cdd5b30e7ddba0286dbcf25845f659afa07ae92182c063fb3b549ed448829197cc2ee SHA512 16628e78b4c9b07283733038e66d9b0ec58a1964593be2aa4e81be117a26944a9d642175ab0eceb06913bb178034d4e49364ae977c60f296cbc3cb0acafdb90e
diff --git a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch b/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
new file mode 100644
index 000000000000..98b58d3dfeff
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
@@ -0,0 +1,79 @@
+From db854a8588c1164df2f54c5718930aadf353b948 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Thu, 18 Aug 2022 10:41:01 +0100
+Subject: [PATCH] backend/native: Don't warn on EACCES if headless
+
+Since commit 1bf70334 "tests/runner: Make test runner use the headless
+backend", tests are run with the native backend in headless mode, which
+will attempt to open each GPU and show a warning (fatal during tests)
+if it cannot.
+
+However, in headless mode we might not be logged in on any seat (for
+example we might be logged in via ssh instead), which means we might
+legitimately not have permission to use any GPUs, even if they exist.
+Downgrade the warning to a debug message in this case.
+
+Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2381
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2584>
+(cherry picked from commit 64a67aa00bfe54fe7219d7f581950897fcbf9a75)
+---
+ src/backends/native/meta-backend-native.c | 35 +++++++++++++++++++----
+ 1 file changed, 30 insertions(+), 5 deletions(-)
+
+diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
+index 224538787..a2babb4b0 100644
+--- a/src/backends/native/meta-backend-native.c
++++ b/src/backends/native/meta-backend-native.c
+@@ -514,8 +514,20 @@ on_udev_device_added (MetaUdev          *udev,
+   new_gpu_kms = create_gpu_from_udev_device (native, device, &error);
+   if (!new_gpu_kms)
+     {
+-      g_warning ("Failed to hotplug secondary gpu '%s': %s",
+-                 device_path, error->message);
++      if (meta_backend_is_headless (backend) &&
++          g_error_matches (error, G_IO_ERROR,
++                           G_IO_ERROR_PERMISSION_DENIED))
++        {
++          meta_topic (META_DEBUG_BACKEND,
++                      "Ignoring unavailable secondary gpu '%s': %s",
++                      device_path, error->message);
++        }
++      else
++        {
++          g_warning ("Failed to hotplug secondary gpu '%s': %s",
++                     device_path, error->message);
++        }
++
+       return;
+     }
+ 
+@@ -552,9 +564,22 @@ init_gpus (MetaBackendNative  *native,
+ 
+       if (!gpu_kms)
+         {
+-          g_warning ("Failed to open gpu '%s': %s",
+-                     g_udev_device_get_device_file (device),
+-                     local_error->message);
++          if (meta_backend_is_headless (backend) &&
++              g_error_matches (local_error, G_IO_ERROR,
++                               G_IO_ERROR_PERMISSION_DENIED))
++            {
++              meta_topic (META_DEBUG_BACKEND,
++                          "Ignoring unavailable gpu '%s': %s'",
++                          g_udev_device_get_device_file (device),
++                          local_error->message);
++            }
++          else
++            {
++              g_warning ("Failed to open gpu '%s': %s",
++                         g_udev_device_get_device_file (device),
++                         local_error->message);
++            }
++
+           g_clear_error (&local_error);
+           continue;
+         }
+-- 
+2.35.1
+
diff --git a/x11-wm/mutter/mutter-42.4.ebuild b/x11-wm/mutter/mutter-42.4-r1.ebuild
index 105efceb6652..dcaaa2a66b00 100644
--- a/x11-wm/mutter/mutter-42.4.ebuild
+++ b/x11-wm/mutter/mutter-42.4-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof sy
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) udev )
 	test? ( wayland )"
-RESTRICT="!test? ( test ) test" # Tests need access to /dev/dri/card0
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
@@ -110,6 +110,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
+	"${FILESDIR}"/${P}-backend-native-Don-t-warn-on-EACCES-if-headless.patch
 )
 
 python_check_deps() {