skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "forward x11 and wayland features to glutin" (#5391) (#5488) 

* Reverts https://github.com/emilk/egui/pull/5391

Because it causes head-ache:
https://github.com/emilk/eframe_template/actions/runs/12357896151/job/34487194281
This commit is contained in:
Emil Ernerfeldt 2024-12-16 19:25:21 +01:00 committed by GitHub
parent d864655018
commit adfc0bebfc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -78,8 +78,8 @@ criterion = { version = "0.5.1", default-features = false }
dify = { version = "0.7", default-features = false } dify = { version = "0.7", default-features = false }
document-features = "0.2.10" document-features = "0.2.10"
glow = "0.16" glow = "0.16"
glutin = { version = "0.32.0", default-features = false } glutin = "0.32.0"
glutin-winit = { version = "0.5.0", default-features = false } glutin-winit = "0.5.0"
home = "0.5.9" home = "0.5.9"
image = { version = "0.25", default-features = false } image = { version = "0.25", default-features = false }
kittest = { version = "0.1" } kittest = { version = "0.1" }

10
crates/eframe/Cargo.toml
View File

@ -72,7 +72,7 @@ persistence = [
] ]
## Enables wayland support and fixes clipboard issue. ## Enables wayland support and fixes clipboard issue.
wayland = ["egui-winit/wayland", "egui-wgpu?/wayland", "egui_glow?/wayland", "glutin?/wayland", "glutin-winit?/wayland"] wayland = ["egui-winit/wayland", "egui-wgpu?/wayland", "egui_glow?/wayland"]
## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web. ## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web.
## ##
@ -98,7 +98,7 @@ web_screen_reader = [
wgpu = ["dep:wgpu", "dep:egui-wgpu", "dep:pollster"] wgpu = ["dep:wgpu", "dep:egui-wgpu", "dep:pollster"]
## Enables compiling for x11. ## Enables compiling for x11.
x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11", "glutin?/x11", "glutin?/glx", "glutin-winit?/x11", "glutin-winit?/glx"] x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11"]
## If set, eframe will look for the env-var `EFRAME_SCREENSHOT_TO` and write a screenshot to that location, and then quit. ## If set, eframe will look for the env-var `EFRAME_SCREENSHOT_TO` and write a screenshot to that location, and then quit.
## This is used to generate images for examples. ## This is used to generate images for examples.
@ -142,8 +142,10 @@ egui-wgpu = { workspace = true, optional = true, features = [
] } # if wgpu is used, use it with winit ] } # if wgpu is used, use it with winit
pollster = { workspace = true, optional = true } # needed for wgpu pollster = { workspace = true, optional = true } # needed for wgpu
glutin = { workspace = true, optional = true, default-features = false, features = ["egl", "wgl"] } # we can expose these to user so that they can select which backends they want to enable to avoid compiling useless deps.
glutin-winit = { workspace = true, optional = true, default-features = false, features = ["egl", "wgl"] } # this can be done at the same time we expose x11/wayland features of winit crate.
glutin = { workspace = true, optional = true }
glutin-winit = { workspace = true, optional = true }
home = { workspace = true, optional = true } home = { workspace = true, optional = true }
wgpu = { workspace = true, optional = true, features = [ wgpu = { workspace = true, optional = true, features = [
# Let's enable some backends so that users can use `eframe` out-of-the-box # Let's enable some backends so that users can use `eframe` out-of-the-box

4
crates/egui_glow/Cargo.toml
View File

@ -74,8 +74,8 @@ wasm-bindgen.workspace = true
[dev-dependencies] [dev-dependencies]
glutin = { workspace = true, default-features = true } # examples/pure_glow glutin.workspace = true # examples/pure_glow
glutin-winit = { workspace = true, default-features = true } glutin-winit.workspace = true
[[example]] [[example]]
name = "pure_glow" name = "pure_glow"