Merge remote-tracking branch 'origin/wlvk' into next-dash-interface

[skip ci]

wlx-overlay-s/Cargo.toml

@@ -82,23 +82,18 @@ vulkano = { workspace = true }
 vulkano-shaders = { workspace = true }
 wgui = { path = "../wgui" }
 wayvr_ipc = { workspace = true }
+bytes = { version = "1.11.0" }
 
 ################################
-#WayVR-only deps
+# Wayland Server deps
 ################################
-khronos-egl = { version = "6.0.0", features = ["static"], optional = true }
 smithay = { version = "0.7.0", default-features = false, features = [
-  "renderer_gl",
-  "backend_egl",
-  "backend_drm",
+  "backend_vulkan",
   "xwayland",
   "wayland_frontend",
 ], optional = true }
 uuid = { version = "1.19.0", features = ["v4", "fast-rng"], optional = true }
 wayland-client = { workspace = true, optional = true }
-wayland-egl = { version = "0.32.8", optional = true }
-bytes = { version = "1.11.0", optional = true }
-wayvr-ipc = { path = "../wayvr-ipc", default-features = false, optional = true }
 rust-embed = { workspace = true }
 signal-hook = "0.3.18"
 ################################
@@ -106,6 +101,7 @@ signal-hook = "0.3.18"
 [build-dependencies]
 regex = { version = "1.12.2" }
 
+# TODO: rename "wayvr" feature to "wayland-server"
 [features]
 default = ["openvr", "openxr", "osc", "x11", "wayland", "wayvr"]
 openvr = ["dep:ovr_overlay", "dep:json"]
@@ -116,13 +112,5 @@ wayland = ["pipewire", "wlx-capture/wlr", "xkbcommon/wayland"]
 pipewire = ["wlx-capture/pipewire"]
 uidev = ["dep:winit"]
 xcb = ["dep:xcb"]
-wayvr = [
-  "dep:khronos-egl",
-  "dep:smithay",
-  "dep:uuid",
-  "dep:wayland-client",
-  "dep:wayland-egl",
-  "dep:bytes",
-  "dep:wayvr-ipc",
-]
+wayvr = ["dep:smithay", "dep:uuid", "dep:wayland-client"]
 as-raw-xcb-connection = []