From 8c9e2e1ff1d22f7954f5e75194e9f77cacffa3f6 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 18 Jul 2023 10:13:59 +0000
Subject: deps: update wlroots (#2734)

---
 nix/wlroots-nvidia.patch | 28 ++++++++++++++++++++++++++++
 nix/wlroots.nix          |  5 +----
 2 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 nix/wlroots-nvidia.patch

(limited to 'nix')

diff --git a/nix/wlroots-nvidia.patch b/nix/wlroots-nvidia.patch
new file mode 100644
index 00000000..130eb041
--- /dev/null
+++ b/nix/wlroots-nvidia.patch
@@ -0,0 +1,28 @@
+diff --git a/types/output/render.c b/types/output/render.c
+index 2e38919a..97f78608 100644
+--- a/types/output/render.c
++++ b/types/output/render.c
+@@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output,
+ }
+ 
+ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
+-	struct wlr_renderer *renderer = output->renderer;
+-	assert(renderer != NULL);
+-
+-	if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
+-		return DRM_FORMAT_INVALID;
+-	}
+-
+-	if (!wlr_output_attach_render(output, NULL)) {
+-		return false;
+-	}
+-
+-	uint32_t fmt = renderer->impl->preferred_read_format(renderer);
+-
+-	output_clear_back_buffer(output);
+-
+-	return fmt;
++	return DRM_FORMAT_XRGB8888;
+ }
+ 
+ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,
diff --git a/nix/wlroots.nix b/nix/wlroots.nix
index 7b05d9ff..2b93da9d 100644
--- a/nix/wlroots.nix
+++ b/nix/wlroots.nix
@@ -44,10 +44,7 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
           })
         ])
         ++ (lib.optionals nvidiaPatches [
-          (fetchpatch {
-            url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git";
-            sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
-          })
+          ./wlroots-nvidia.patch
         ]);
       postPatch =
         (old.postPatch or "")
-- 
cgit v1.2.3