Skip to content

Commit adfc0be

Browse files
authoredDec 16, 2024
Revert "forward x11 and wayland features to glutin" (emilk#5391) (emilk#5488)
* Reverts emilk#5391 Because it causes head-ache: https://github.com/emilk/eframe_template/actions/runs/12357896151/job/34487194281
1 parent d864655 commit adfc0be

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed
 

Diff for: ‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ criterion = { version = "0.5.1", default-features = false }
7878
dify = { version = "0.7", default-features = false }
7979
document-features = "0.2.10"
8080
glow = "0.16"
81-
glutin = { version = "0.32.0", default-features = false }
82-
glutin-winit = { version = "0.5.0", default-features = false }
81+
glutin = "0.32.0"
82+
glutin-winit = "0.5.0"
8383
home = "0.5.9"
8484
image = { version = "0.25", default-features = false }
8585
kittest = { version = "0.1" }

Diff for: ‎crates/eframe/Cargo.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ persistence = [
7272
]
7373

7474
## Enables wayland support and fixes clipboard issue.
75-
wayland = ["egui-winit/wayland", "egui-wgpu?/wayland", "egui_glow?/wayland", "glutin?/wayland", "glutin-winit?/wayland"]
75+
wayland = ["egui-winit/wayland", "egui-wgpu?/wayland", "egui_glow?/wayland"]
7676

7777
## Enable screen reader support (requires `ctx.options_mut(|o| o.screen_reader = true);`) on web.
7878
##
@@ -98,7 +98,7 @@ web_screen_reader = [
9898
wgpu = ["dep:wgpu", "dep:egui-wgpu", "dep:pollster"]
9999

100100
## Enables compiling for x11.
101-
x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11", "glutin?/x11", "glutin?/glx", "glutin-winit?/x11", "glutin-winit?/glx"]
101+
x11 = ["egui-winit/x11", "egui-wgpu?/x11", "egui_glow?/x11"]
102102

103103
## If set, eframe will look for the env-var `EFRAME_SCREENSHOT_TO` and write a screenshot to that location, and then quit.
104104
## This is used to generate images for examples.
@@ -142,8 +142,10 @@ egui-wgpu = { workspace = true, optional = true, features = [
142142
] } # if wgpu is used, use it with winit
143143
pollster = { workspace = true, optional = true } # needed for wgpu
144144

145-
glutin = { workspace = true, optional = true, default-features = false, features = ["egl", "wgl"] }
146-
glutin-winit = { workspace = true, optional = true, default-features = false, features = ["egl", "wgl"] }
145+
# we can expose these to user so that they can select which backends they want to enable to avoid compiling useless deps.
146+
# this can be done at the same time we expose x11/wayland features of winit crate.
147+
glutin = { workspace = true, optional = true }
148+
glutin-winit = { workspace = true, optional = true }
147149
home = { workspace = true, optional = true }
148150
wgpu = { workspace = true, optional = true, features = [
149151
# Let's enable some backends so that users can use `eframe` out-of-the-box

Diff for: ‎crates/egui_glow/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ wasm-bindgen.workspace = true
7474

7575

7676
[dev-dependencies]
77-
glutin = { workspace = true, default-features = true } # examples/pure_glow
78-
glutin-winit = { workspace = true, default-features = true }
77+
glutin.workspace = true # examples/pure_glow
78+
glutin-winit.workspace = true
7979

8080
[[example]]
8181
name = "pure_glow"

0 commit comments

Comments
 (0)