···11+--- original
22++++ modified
33+@@ -8,13 +8,14 @@
44+ use std::thread::Builder;
55+66+ use byte_slice_cast::*;
77++use gstreamer;
88+ use gstreamer::prelude::*;
99+ use gstreamer_app::{AppSrc, AppSrcCallbacks};
1010++use gstreamer_audio;
1111+ use servo_media_audio::block::{Chunk, FRAMES_PER_BLOCK};
1212+ use servo_media_audio::render_thread::AudioRenderThreadMsg;
1313+ use servo_media_audio::sink::{AudioSink, AudioSinkError};
1414+ use servo_media_streams::MediaSocket;
1515+-use {gstreamer, gstreamer_audio};
1616+1717+ use crate::media_stream::GstreamerMediaSocket;
1818+
···11+--- original
22++++ modified
33+@@ -7,8 +7,12 @@
44+ use std::sync::{Arc, Mutex};
55+ use std::{cmp, mem};
66+77++use glib;
88+ use glib::prelude::*;
99++use gstreamer;
1010+ use gstreamer::prelude::*;
1111++use gstreamer_sdp;
1212++use gstreamer_webrtc;
1313+ use log::warn;
1414+ use servo_media_streams::MediaStreamType;
1515+ use servo_media_streams::registry::{MediaStreamId, get_stream};
1616+@@ -15,7 +19,6 @@
1717+ use servo_media_webrtc::datachannel::DataChannelId;
1818+ use servo_media_webrtc::thread::InternalEvent;
1919+ use servo_media_webrtc::{WebRtcController as WebRtcThread, *};
2020+-use {glib, gstreamer, gstreamer_sdp, gstreamer_webrtc};
2121+2222+ use super::BACKEND_BASE_TIME;
2323+ use crate::datachannel::GStreamerWebRtcDataChannel;
+13
patches/components/webgpu/lib.rs.patch
···11+--- original
22++++ modified
33+@@ -7,8 +7,9 @@
44+ use log::warn;
55+ use servo_base::generic_channel::{self, GenericReceiver};
66+ use webgpu_traits::{WebGPU, WebGPUMsg};
77++pub use wgpu_core as wgc;
88+ use wgpu_thread::WGPU;
99+-pub use {wgpu_core as wgc, wgpu_types as wgt};
1010++pub use wgpu_types as wgt;
1111+1212+ mod poll_thread;
1313+ mod wgpu_thread;
+18
patches/components/webgpu/wgpu_thread.rs.patch
···11+--- original
22++++ modified
33+@@ -26,13 +26,14 @@
44+ use wgc::id::DeviceId;
55+ use wgc::pipeline::ShaderModuleDescriptor;
66+ use wgc::resource::BufferMapOperation;
77++pub use wgpu_core as wgc;
88+ use wgpu_core::command::RenderPassDescriptor;
99+ use wgpu_core::device::DeviceError;
1010+ use wgpu_core::pipeline::{CreateComputePipelineError, CreateRenderPipelineError};
1111+ use wgpu_core::resource::BufferAccessResult;
1212++pub use wgpu_types as wgt;
1313+ use wgpu_types::MemoryHints;
1414+ use wgt::InstanceDescriptor;
1515+-pub use {wgpu_core as wgc, wgpu_types as wgt};
1616+1717+ use crate::canvas_context::WebGpuExternalImageMap;
1818+ use crate::poll_thread::Poller;