Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 19 insertions, 0 deletions

diff --git a/x11/ashell/files/iced/patch-wgpu_src_window_x11.rs b/x11/ashell/files/iced/patch-wgpu_src_window_x11.rs
new file mode 100644
index 000000000000..6cf65d257aa8
--- /dev/null
+++ b/x11/ashell/files/iced/patch-wgpu_src_window_x11.rs
@@ -0,0 +1,19 @@
+--- wgpu/src/window/x11.rs.orig	2025-09-19 07:04:16 UTC
++++ wgpu/src/window/x11.rs
+@@ -145,7 +145,7 @@ pub fn get_x11_device_ids<W: Window>(window: &W) -> Op
+                                         let stat =
+                                             stat(Path::new("/dev/dri").join(device)).ok()?;
+                                         let dev = stat.st_rdev;
+-                                        return super::ids_from_dev(dev);
++                                        return super::ids_from_dev(dev.into());
+                                     }
+                                 }
+                             }
+@@ -166,6 +166,6 @@ pub fn get_x11_device_ids<W: Window>(window: &W) -> Op
+         let device_fd = dri3.device_fd;
+         let stat = fstat(device_fd).ok()?;
+         let dev = stat.st_rdev;
+-        super::ids_from_dev(dev)
++        super::ids_from_dev(dev.into())
+     }
+ }