chore: Switch egui back to release 0.29.0 from git

Cargo.toml

@@ -50,7 +50,7 @@ tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 naga = { version = "22.1.0", features = ["wgsl-out"] }
 wgpu = "22.1.0"
-egui = { git = "https://github.com/emilk/egui.git", rev = "06f709481a4e5e74bec961544c77e9afcae265db" }
+egui = "0.29.0"
 clap = { version = "4.5.18", features = ["derive"] }
 cpal = "0.15.3"
 anyhow = "1.0"

core/Cargo.toml

@@ -55,7 +55,7 @@ hashbrown = { version = "0.14.5", features = ["raw"] }
 scopeguard = "1.2.0"
 fluent-templates = "0.11.0"
 egui = { workspace = true, optional = true }
-egui_extras = { git = "https://github.com/emilk/egui.git", rev = "06f709481a4e5e74bec961544c77e9afcae265db", default-features = false, optional = true }
+egui_extras = { version = "0.29.0", default-features = false, optional = true }
 png = { version = "0.17.13", optional = true }
 flv-rs = { path = "../flv" }
 async-channel = { workspace = true }

deny.toml

@@ -74,11 +74,9 @@ unknown-registry = "deny"
 unknown-git = "deny"
 
 [sources.allow-org]
-#  github.com organizations to allow git sources for
+# github.com organizations to allow git sources for
 github = [
     "ruffle-rs",
-    # TODO: Remove once a release with https://github.com/emilk/egui/pull/4939 in it is out.
-    "emilk",
 ]
 
 [advisories]

desktop/Cargo.toml

@@ -14,10 +14,10 @@ workspace = true
 clap = { workspace = true }
 cpal = { workspace = true }
 egui = { workspace = true }
-egui_extras = { git = "https://github.com/emilk/egui.git", rev = "06f709481a4e5e74bec961544c77e9afcae265db", default-features = false, features = ["image"] }
-egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "06f709481a4e5e74bec961544c77e9afcae265db", features = ["winit"] }
+egui_extras = { version = "0.29.0", default-features = false, features = ["image"] }
+egui-wgpu = { version = "0.29.0", features = ["winit"] }
 image = { workspace = true, features = ["png"] }
-egui-winit = { git = "https://github.com/emilk/egui.git", rev = "06f709481a4e5e74bec961544c77e9afcae265db" }
+egui-winit = "0.29.0"
 fontdb = "0.22"
 ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] }
 ruffle_render = { path = "../render", features = ["clap"] }

desktop/src/gui/controller.rs

@@ -353,18 +353,20 @@ impl GuiController {
         {
             let surface_view = surface_texture.texture.create_view(&Default::default());
 
-            let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
-                    view: &surface_view,
-                    resolve_target: None,
-                    ops: wgpu::Operations {
-                        load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
-                        store: wgpu::StoreOp::Store,
-                    },
-                })],
-                label: Some("egui_render"),
-                ..Default::default()
-            });
+            let mut render_pass = encoder
+                .begin_render_pass(&wgpu::RenderPassDescriptor {
+                    color_attachments: &[Some(wgpu::RenderPassColorAttachment {
+                        view: &surface_view,
+                        resolve_target: None,
+                        ops: wgpu::Operations {
+                            load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),
+                            store: wgpu::StoreOp::Store,
+                        },
+                    })],
+                    label: Some("egui_render"),
+                    ..Default::default()
+                })
+                .forget_lifetime();
 
             if let Some(movie_view) = movie_view {
                 movie_view.render(&self.movie_view_renderer, &mut render_pass);

desktop/src/gui/movie.rs

@@ -201,10 +201,10 @@ impl MovieView {
         }
     }
 
-    pub fn render<'pass, 'global: 'pass>(
-        &'pass self,
-        renderer: &'global MovieViewRenderer,
-        render_pass: &mut wgpu::RenderPass<'pass>,
+    pub fn render(
+        &self,
+        renderer: &MovieViewRenderer,
+        render_pass: &mut wgpu::RenderPass<'static>,
     ) {
         render_pass.set_pipeline(&renderer.pipeline);
         render_pass.set_bind_group(0, &self.bind_group, &[]);