Use once_cell crate directly again

The glib crate does not depend on it anymore and also does not re-export
it anymore.

Also switch some usages of OnceCell to OnceLock from std.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1441>

Cargo.lock

@@ -2134,6 +2134,7 @@ dependencies = [
  "hrtf",
  "nnnoiseless",
  "num-traits",
+ "once_cell",
  "rayon",
  "smallvec",
 ]
@@ -2160,6 +2161,7 @@ dependencies = [
  "gstreamer-audio",
  "gstreamer-base",
  "gstreamer-check",
+ "once_cell",
  "percent-encoding",
  "rand",
  "serde",
@@ -2183,6 +2185,7 @@ dependencies = [
  "gstreamer-video",
  "image",
  "muldiv",
+ "once_cell",
 ]
 
 [[package]]
@@ -2217,6 +2220,7 @@ dependencies = [
  "gstreamer-check",
  "gstreamer-video",
  "nom",
+ "once_cell",
  "pango",
  "pangocairo",
  "pretty_assertions",
@@ -2237,6 +2241,7 @@ dependencies = [
  "gstreamer-audio",
  "gstreamer-base",
  "gstreamer-check",
+ "once_cell",
 ]
 
 [[package]]
@@ -2249,6 +2254,7 @@ dependencies = [
  "gstreamer-base",
  "gstreamer-video",
  "num_cpus",
+ "once_cell",
 ]
 
 [[package]]
@@ -2265,6 +2271,7 @@ dependencies = [
  "gstreamer-check",
  "gstreamer-video",
  "gtk4",
+ "once_cell",
  "parking_lot",
 ]
 
@@ -2278,6 +2285,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-check",
  "gstreamer-video",
+ "once_cell",
 ]
 
 [[package]]
@@ -2287,6 +2295,7 @@ dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
  "gstreamer-base",
+ "once_cell",
  "url",
 ]
 
@@ -2303,6 +2312,7 @@ dependencies = [
  "muldiv",
  "nom",
  "num-rational",
+ "once_cell",
  "smallvec",
 ]
 
@@ -2322,6 +2332,7 @@ dependencies = [
  "gstreamer-pbutils",
  "gstreamer-video",
  "m3u8-rs",
+ "once_cell",
  "quick-xml",
  "serde",
 ]
@@ -2356,6 +2367,7 @@ dependencies = [
  "gstreamer-gl-x11",
  "gstreamer-video",
  "gtk4",
+ "once_cell",
  "windows-sys 0.52.0",
 ]
 
@@ -2390,6 +2402,7 @@ dependencies = [
  "gstreamer-check",
  "gstreamer-video",
  "num-traits",
+ "once_cell",
 ]
 
 [[package]]
@@ -2417,6 +2430,7 @@ dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
  "gstreamer-check",
+ "once_cell",
  "serde",
  "serde_json",
 ]
@@ -2432,6 +2446,7 @@ dependencies = [
  "gstreamer-audio",
  "gstreamer-check",
  "lewton",
+ "once_cell",
 ]
 
 [[package]]
@@ -2447,6 +2462,7 @@ dependencies = [
  "gtk4",
  "muldiv",
  "num-rational",
+ "once_cell",
  "parking_lot",
 ]
 
@@ -2461,6 +2477,7 @@ dependencies = [
  "gstreamer-base",
  "gstreamer-pbutils",
  "gstreamer-video",
+ "once_cell",
  "tempfile",
  "url",
 ]
@@ -2481,6 +2498,7 @@ dependencies = [
  "gstreamer-base",
  "gstreamer-video",
  "libloading",
+ "once_cell",
  "quick-xml",
  "smallvec",
  "thiserror",
@@ -2497,6 +2515,7 @@ dependencies = [
  "gstreamer-base",
  "gstreamer-rtp",
  "gstreamer-video",
+ "once_cell",
  "pango",
  "pangocairo",
  "xmlparser",
@@ -2525,6 +2544,7 @@ dependencies = [
  "gstreamer-base",
  "gstreamer-check",
  "gstreamer-rtp",
+ "once_cell",
  "rand",
  "raptorq",
 ]
@@ -2538,6 +2558,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-check",
  "gstreamer-video",
+ "once_cell",
  "rav1e",
 ]
 
@@ -2548,6 +2569,7 @@ dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
  "gstreamer-check",
+ "once_cell",
  "regex",
 ]
 
@@ -2562,6 +2584,7 @@ dependencies = [
  "headers",
  "hyper",
  "mime",
+ "once_cell",
  "reqwest",
  "tokio",
  "url",
@@ -2577,6 +2600,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-check",
  "gstreamer-rtp",
+ "once_cell",
 ]
 
 [[package]]
@@ -2609,6 +2633,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-base",
  "librespot",
+ "once_cell",
  "tokio",
  "url",
 ]
@@ -2619,6 +2644,7 @@ version = "0.12.0-alpha.1"
 dependencies = [
  "gst-plugin-version-helper",
  "gstreamer",
+ "once_cell",
 ]
 
 [[package]]
@@ -2629,6 +2655,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-check",
  "hyphenation",
+ "once_cell",
  "textwrap",
 ]
 
@@ -2676,6 +2703,7 @@ dependencies = [
  "gstreamer-check",
  "gstreamer-video",
  "gtk4",
+ "once_cell",
  "parking_lot",
 ]
 
@@ -2686,6 +2714,7 @@ dependencies = [
  "anyhow",
  "gst-plugin-version-helper",
  "gstreamer",
+ "once_cell",
  "regex",
  "signal-hook",
 ]
@@ -2701,6 +2730,7 @@ dependencies = [
  "gstreamer-base",
  "gstreamer-video",
  "num-traits",
+ "once_cell",
 ]
 
 [[package]]
@@ -2713,6 +2743,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-app",
  "more-asserts",
+ "once_cell",
  "thiserror",
  "url",
 ]
@@ -2741,6 +2772,7 @@ dependencies = [
  "gstreamer-video",
  "image",
  "image_hasher",
+ "once_cell",
  "rgb",
 ]
 
@@ -2753,6 +2785,7 @@ dependencies = [
  "gstreamer-check",
  "gstreamer-video",
  "libwebp-sys2",
+ "once_cell",
  "pretty_assertions",
 ]
 
@@ -2791,6 +2824,7 @@ dependencies = [
  "human_bytes",
  "livekit-api",
  "livekit-protocol",
+ "once_cell",
  "parse_link_header",
  "rand",
  "regex",
@@ -2851,6 +2885,7 @@ dependencies = [
  "gstreamer",
  "gstreamer-sdp",
  "gstreamer-webrtc",
+ "once_cell",
  "parse_link_header",
  "reqwest",
  "tokio",

audio/audiofx/Cargo.toml

@@ -21,6 +21,7 @@ nnnoiseless = { version = "0.5", default-features = false }
 smallvec = "1"
 atomic_refcell = "0.1"
 rayon = "1.5"
+once_cell = "1"
 
 [lib]
 name = "gstrsaudiofx"

audio/audiofx/src/audioecho/imp.rs

@@ -19,7 +19,7 @@ use byte_slice_cast::*;
 use num_traits::cast::{FromPrimitive, ToPrimitive};
 use num_traits::float::Float;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static _CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "rsaudioecho",

audio/audiofx/src/audioloudnorm/imp.rs

@@ -22,7 +22,7 @@ use std::u64;
 
 use byte_slice_cast::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use atomic_refcell::AtomicRefCell;
 

audio/audiofx/src/audiornnoise/imp.rs

@@ -21,7 +21,7 @@ use nnnoiseless::DenoiseState;
 
 use byte_slice_cast::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use atomic_refcell::AtomicRefCell;
 

audio/audiofx/src/ebur128level/imp.rs

@@ -16,7 +16,7 @@ use std::i32;
 use std::sync::atomic;
 use std::sync::Mutex;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use byte_slice_cast::*;
 

audio/audiofx/src/hrtfrender/imp.rs

@@ -23,7 +23,7 @@ use byte_slice_cast::*;
 use rayon::prelude::*;
 use rayon::{ThreadPool, ThreadPoolBuilder};
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "hrtfrender",

audio/audiofx/tests/hrtfrender.rs

@@ -9,7 +9,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 static CONFIG: Lazy<glib::Bytes> = Lazy::new(|| {
     let buff = include_bytes!("test.hrir");

audio/claxon/src/claxondec/imp.rs

@@ -19,7 +19,7 @@ use atomic_refcell::AtomicRefCell;
 
 use byte_slice_cast::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(

audio/csound/Cargo.toml

@@ -14,6 +14,7 @@ gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/g
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 csound = "0.1.8"
 byte-slice-cast = "1.0"
+once_cell = "1"
 
 [dev-dependencies]
 gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }

audio/csound/src/filter/imp.rs

@@ -23,7 +23,7 @@ use byte_slice_cast::*;
 
 use csound::{Csound, MessageType};
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(

audio/lewton/Cargo.toml

@@ -14,6 +14,7 @@ gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org
 lewton = { version = "0.10", default-features = false }
 byte-slice-cast = "1.0"
 atomic_refcell = "0.1"
+once_cell = "1"
 
 [dev-dependencies]
 gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }

audio/lewton/src/lewtondec/imp.rs

@@ -18,7 +18,7 @@ use atomic_refcell::AtomicRefCell;
 
 use byte_slice_cast::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 struct State {
     header_bufs: (

audio/spotify/Cargo.toml

@@ -16,6 +16,7 @@ tokio = "1.0"
 futures = "0.3"
 anyhow = "1.0"
 url = "2.3"
+once_cell = "1"
 
 [lib]
 name = "gstspotify"

audio/spotify/src/spotifyaudiosrc/imp.rs

@@ -9,7 +9,7 @@
 use std::sync::{mpsc, Arc, Mutex, MutexGuard};
 
 use futures::future::{AbortHandle, Abortable, Aborted};
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use tokio::{runtime, task::JoinHandle};
 
 use gst::glib;

generic/file/Cargo.toml

@@ -12,6 +12,7 @@ rust-version = "1.70"
 url = "2"
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
+once_cell = "1"
 
 [lib]
 name = "gstrsfile"

generic/file/src/filesink/imp.rs

@@ -55,7 +55,7 @@ pub struct FileSink {
     state: Mutex<State>,
 }
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "rsfilesink",

generic/file/src/filesrc/imp.rs

@@ -54,7 +54,7 @@ pub struct FileSrc {
     state: Mutex<State>,
 }
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "rsfilesrc",

generic/sodium/src/decrypter/imp.rs

@@ -29,7 +29,7 @@ use sodiumoxide::crypto::box_;
 
 use std::sync::Mutex;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "sodiumdecrypter",

generic/sodium/src/encrypter/imp.rs

@@ -32,7 +32,7 @@ type BufferVec = SmallVec<[gst::Buffer; 16]>;
 
 use std::sync::Mutex;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "sodiumencrypter",

generic/sodium/tests/decrypter.rs

@@ -31,7 +31,7 @@ use std::path::PathBuf;
 
 use pretty_assertions::assert_eq;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static SENDER_PUBLIC: Lazy<glib::Bytes> = Lazy::new(|| {
     let public = [
         66, 248, 199, 74, 216, 55, 228, 116, 52, 17, 147, 56, 65, 130, 134, 148, 157, 153, 235,

generic/sodium/tests/encrypter.rs

@@ -25,7 +25,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use pretty_assertions::assert_eq;
 

generic/threadshare/examples/benchmark.rs

@@ -18,8 +18,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
+use once_cell::sync::Lazy;
 
 use std::env;
 use std::sync::atomic::{AtomicU64, Ordering};

generic/threadshare/examples/standalone/main.rs

@@ -1,5 +1,5 @@
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 mod args;
 use args::*;

generic/threadshare/examples/standalone/sink/async_mutex/imp.rs

@@ -14,7 +14,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use gstthreadshare::runtime::executor::block_on_or_add_sub_task;
 use gstthreadshare::runtime::{prelude::*, PadSink};

generic/threadshare/examples/standalone/sink/mod.rs

@@ -12,7 +12,7 @@ pub const ASYNC_MUTEX_ELEMENT_NAME: &str = "ts-standalone-async-mutex-sink";
 pub const SYNC_MUTEX_ELEMENT_NAME: &str = "ts-standalone-sync-mutex-sink";
 pub const TASK_ELEMENT_NAME: &str = "ts-standalone-task-sink";
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "ts-standalone-sink",

generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs

@@ -14,7 +14,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use gstthreadshare::runtime::{prelude::*, PadSink};
 

generic/threadshare/examples/standalone/sink/task/imp.rs

@@ -15,7 +15,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use gstthreadshare::runtime::prelude::*;
 use gstthreadshare::runtime::{Context, PadSink, Task};

generic/threadshare/examples/standalone/src/imp.rs

@@ -13,7 +13,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::sync::Mutex;
 use std::time::Duration;

generic/threadshare/examples/udpsrc_benchmark_sender.rs

@@ -20,7 +20,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::net;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};

generic/threadshare/src/appsrc/imp.rs

@@ -26,7 +26,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::sync::Mutex;
 use std::time::Duration;

generic/threadshare/src/audiotestsrc/imp.rs

@@ -13,7 +13,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::mem::size_of;
 use std::sync::Mutex;

generic/threadshare/src/dataqueue.rs

@@ -21,7 +21,7 @@ use futures::future::{self, abortable, AbortHandle};
 
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::VecDeque;
 use std::sync::Arc;

generic/threadshare/src/inputselector/imp.rs

@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};

generic/threadshare/src/jitterbuffer/imp.rs

@@ -26,7 +26,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_rtp::RTPBuffer;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::cmp::Ordering;
 use std::collections::{BTreeSet, VecDeque};

generic/threadshare/src/proxy/imp.rs

@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::{HashMap, VecDeque};
 use std::sync::{Arc, Weak};

generic/threadshare/src/queue/imp.rs

@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::VecDeque;
 use std::sync::Mutex;

generic/threadshare/src/runtime/executor/context.rs

@@ -5,7 +5,7 @@
 
 use futures::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::HashMap;
 use std::io;

generic/threadshare/src/runtime/mod.rs

@@ -44,7 +44,7 @@ pub mod prelude {
     pub use super::task::TaskImpl;
 }
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 static RUNTIME_CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(

generic/threadshare/src/socket.rs

@@ -23,7 +23,7 @@ use futures::future::BoxFuture;
 use gst::glib;
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::error;
 use std::fmt;

generic/threadshare/src/tcpclientsrc/imp.rs

@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::io;
 use std::net::{IpAddr, SocketAddr, TcpStream};

generic/threadshare/src/udpsink/imp.rs

@@ -26,7 +26,7 @@ use gst::subclass::prelude::*;
 use gst::EventView;
 use gst::{element_error, error_msg};
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use crate::runtime::executor::block_on_or_add_sub_task;
 use crate::runtime::prelude::*;

generic/threadshare/src/udpsrc/imp.rs

@@ -25,7 +25,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_net::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::i32;
 use std::io;

generic/threadshare/tests/jitterbuffer.rs

@@ -21,7 +21,7 @@ use gst::prelude::*;
 
 use std::sync::mpsc;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(

generic/threadshare/tests/pad.rs

@@ -29,7 +29,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;

generic/threadshare/tests/pipeline.rs

@@ -20,7 +20,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::sync::mpsc;
 

mux/flavors/Cargo.toml

@@ -18,6 +18,7 @@ flavors = { git = "https://github.com/rust-av/flavors" }
 muldiv = "1.0"
 byteorder = "1.0"
 smallvec = "1.0"
+once_cell = "1"
 
 [lib]
 name = "gstrsflv"

mux/flavors/src/flvdemux/imp.rs

@@ -21,7 +21,7 @@ use gst::subclass::prelude::*;
 
 use num_rational::Rational32;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use smallvec::SmallVec;
 

mux/fmp4/Cargo.toml

@@ -15,6 +15,7 @@ gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/g
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] }
 gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] }
 gst-pbutils = { package = "gstreamer-pbutils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] }
+once_cell = "1"
 
 [lib]
 name = "gstfmp4"

mux/fmp4/src/fmp4mux/imp.rs

@@ -16,7 +16,7 @@ use std::collections::VecDeque;
 use std::mem;
 use std::sync::Mutex;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use super::boxes;
 use super::Buffer;

mux/mp4/Cargo.toml

@@ -15,6 +15,7 @@ gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/g
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] }
 gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] }
 gst-pbutils = { package = "gstreamer-pbutils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_18"] }
+once_cell = "1"
 
 [lib]
 name = "gstmp4"

mux/mp4/src/mp4mux/imp.rs

@@ -15,7 +15,7 @@ use gst_base::subclass::prelude::*;
 use std::collections::VecDeque;
 use std::sync::Mutex;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use super::boxes;
 

net/aws/Cargo.toml

@@ -31,6 +31,7 @@ serde = "1"
 serde_derive = "1"
 serde_json = "1"
 url = "2"
+once_cell = "1"
 
 [dev-dependencies]
 chrono = { version = "0.4", features = [ "alloc" ] }

net/aws/src/s3hlssink/imp.rs

@@ -9,7 +9,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use futures::future;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use std::io::Write;
 use std::str::FromStr;
 use std::sync::mpsc::{self, Receiver, SyncSender};

net/aws/src/s3sink/multipartsink.rs

@@ -26,7 +26,7 @@ use aws_sdk_s3::{
 };
 
 use futures::future;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use std::collections::HashMap;
 use std::convert::From;
 use std::sync::Mutex;

net/aws/src/s3sink/putobjectsink.rs

@@ -21,7 +21,7 @@ use aws_sdk_s3::{
 };
 
 use futures::future;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use std::collections::HashMap;
 use std::convert::From;
 use std::sync::Mutex;

net/aws/src/s3src/imp.rs

@@ -8,7 +8,7 @@
 
 use bytes::Bytes;
 use futures::future;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use std::sync::Mutex;
 use std::time::Duration;
 

net/aws/src/s3utils.rs

@@ -15,7 +15,7 @@ use aws_types::sdk_config::SdkConfig;
 
 use bytes::{buf::BufMut, Bytes, BytesMut};
 use futures::{future, Future};
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use std::sync::Mutex;
 use std::time::Duration;
 use tokio::runtime;

net/aws/src/transcribe_parse/imp.rs

@@ -11,7 +11,7 @@ use gst::subclass::prelude::*;
 use gst::{element_imp_error, error_msg};
 use serde_derive::Deserialize;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::sync::Mutex;
 

net/aws/src/transcriber/imp.rs

@@ -31,7 +31,7 @@ use tokio::{runtime, sync::broadcast, task};
 use std::collections::{BTreeSet, VecDeque};
 use std::sync::{Arc, Mutex};
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use super::transcribe::{TranscriberSettings, TranscriberStream, TranscriptEvent, TranscriptItem};
 use super::translate::{TranslateLoop, TranslatedItem};

net/aws/src/transcriber/mod.rs

@@ -13,7 +13,7 @@ mod imp;
 mod transcribe;
 mod translate;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(

net/hlssink3/src/imp.rs

@@ -12,10 +12,10 @@ use crate::HlsSink3PlaylistType;
 use chrono::{DateTime, Duration, Utc};
 use gio::prelude::*;
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use m3u8_rs::{MediaPlaylist, MediaPlaylistType, MediaSegment};
+use once_cell::sync::Lazy;
 use std::fs;
 use std::io::Write;
 use std::path;

net/hlssink3/tests/hlssink3.rs

@@ -7,9 +7,9 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use gio::prelude::*;
-use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
 use gsthlssink3::HlsSink3PlaylistType;
+use once_cell::sync::Lazy;
 use std::io::Write;
 use std::sync::{mpsc, Arc, Mutex};
 use std::time::Duration;

net/ndi/Cargo.toml

@@ -23,6 +23,7 @@ libloading = "0.8"
 quick-xml = "0.31"
 smallvec = { version = "1.11", features = ["const_generics"] }
 thiserror = "1.0"
+once_cell = "1"
 
 [build-dependencies]
 gst-plugin-version-helper = { path = "../../version-helper" }

net/ndi/src/device_provider/imp.rs

@@ -3,13 +3,12 @@
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::OnceCell;
+use std::{
+    sync::{atomic, Mutex, OnceLock},
+    thread,
+};
 
-use std::sync::atomic;
+use once_cell::sync::Lazy;
-use std::sync::Mutex;
-use std::thread;
-
-use gst::glib::once_cell::sync::Lazy;
 
 use crate::ndi;
 
@@ -190,7 +189,7 @@ impl DeviceProvider {
 
 #[derive(Debug)]
 pub struct Device {
-    source: OnceCell<ndi::Source<'static>>,
+    source: OnceLock<ndi::Source<'static>>,
 }
 
 #[glib::object_subclass]
@@ -201,7 +200,7 @@ impl ObjectSubclass for Device {
 
     fn new() -> Self {
         Self {
-            source: OnceCell::new(),
+            source: OnceLock::new(),
         }
     }
 }

net/ndi/src/lib.rs

@@ -30,7 +30,7 @@ mod ndi_cc_meta;
 #[cfg(feature = "doc")]
 use gst::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy, glib::Enum, Default)]
 #[repr(u32)]

net/ndi/src/ndi_cc_meta.rs

@@ -9,9 +9,9 @@ use anyhow::{bail, Result};
 use data_encoding::BASE64;
 use smallvec::SmallVec;
 
-use gst::glib::once_cell::sync::Lazy;
 use gst::glib::translate::IntoGlib;
 use gst_video::{VideoAncillary, VideoAncillaryDID16, VideoVBIEncoder, VideoVBIParser};
+use once_cell::sync::Lazy;
 
 use std::ffi::CString;
 

net/ndi/src/ndisink/imp.rs

@@ -8,7 +8,7 @@ use gst_base::subclass::prelude::*;
 
 use std::sync::Mutex;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use crate::ndi::SendInstance;
 use crate::ndi_cc_meta::NDICCMetaEncoder;

net/ndi/src/ndisinkcombiner/imp.rs

@@ -7,7 +7,7 @@ use gst::subclass::prelude::*;
 use gst_base::prelude::*;
 use gst_base::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::mem;
 use std::sync::Mutex;

net/ndi/src/ndisinkmeta.rs

@@ -53,7 +53,7 @@ impl fmt::Debug for NdiSinkAudioMeta {
 
 mod imp {
     use glib::translate::*;
-    use gst::glib::once_cell::sync::Lazy;
+    use once_cell::sync::Lazy;
     use std::mem;
     use std::ptr;
 

net/ndi/src/ndisrc/imp.rs

@@ -9,7 +9,7 @@ use gst_base::subclass::prelude::*;
 use std::sync::Mutex;
 use std::u32;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use crate::ndisrcmeta::NdiSrcMeta;
 use crate::ndisys;

net/ndi/src/ndisrc/receiver.rs

@@ -8,7 +8,7 @@ use std::sync::{Arc, Condvar, Mutex, Weak};
 use std::thread;
 use std::time;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use crate::ndi::*;
 use crate::ndisrcmeta::Buffer;

net/ndi/src/ndisrcdemux/imp.rs

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use atomic_refcell::AtomicRefCell;
-use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_video::prelude::*;
+use once_cell::sync::Lazy;
 
 use std::{cmp, collections::VecDeque, sync::Mutex};
 

net/ndi/src/ndisrcmeta.rs

@@ -85,7 +85,7 @@ mod imp {
 
     use super::Buffer;
     use glib::translate::*;
-    use gst::glib::once_cell::sync::Lazy;
+    use once_cell::sync::Lazy;
     use std::mem;
     use std::ptr;
 

net/ndi/src/ndisys.rs

@@ -8,7 +8,7 @@
     clippy::missing_safety_doc
 )]
 
-use glib::once_cell::sync::OnceCell;
+use once_cell::sync::OnceCell;
 
 #[cfg(unix)]
 use libloading::os::unix::{Library, Symbol};

net/onvif/Cargo.toml

@@ -19,6 +19,7 @@ cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", features=["use_glib"
 pango = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 xmltree = "0.10"
+once_cell = "1"
 
 [lib]
 name = "gstrsonvif"

net/onvif/src/lib.rs

@@ -13,7 +13,7 @@
  * Since: plugins-rs-0.9.0
  */
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 mod onvifmetadatacombiner;
 mod onvifmetadatadepay;

net/onvif/src/onvifmetadatacombiner/imp.rs

@@ -1,10 +1,10 @@
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_base::prelude::*;
 use gst_base::subclass::prelude::*;
 use gst_base::AGGREGATOR_FLOW_NEED_DATA;
+use once_cell::sync::Lazy;
 use std::sync::Mutex;
 
 #[derive(Default)]

net/onvif/src/onvifmetadatadepay/imp.rs

@@ -1,8 +1,8 @@
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::subclass::prelude::*;
 use gst_rtp::prelude::*;
 use gst_rtp::subclass::prelude::*;
+use once_cell::sync::Lazy;
 use std::sync::Mutex;
 
 #[derive(Default)]

net/onvif/src/onvifmetadataoverlay/imp.rs

@@ -4,7 +4,7 @@ use gst::subclass::prelude::*;
 use gst_video::prelude::*;
 use pango::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::HashSet;
 use std::sync::Mutex;

net/onvif/src/onvifmetadataparse/imp.rs

@@ -10,7 +10,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::BTreeMap;
 use std::sync::{Condvar, Mutex};

net/onvif/src/onvifmetadatapay/imp.rs

@@ -1,8 +1,8 @@
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::subclass::prelude::*;
 use gst_rtp::prelude::*;
 use gst_rtp::subclass::prelude::*;
+use once_cell::sync::Lazy;
 
 #[derive(Default)]
 pub struct OnvifMetadataPay {}

net/raptorq/Cargo.toml

@@ -12,6 +12,7 @@ rust-version = "1.70"
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-rtp = { package = "gstreamer-rtp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
+once_cell = "1"
 raptorq = "1.7"
 
 [dev-dependencies]

net/raptorq/src/raptorqdec/imp.rs

@@ -11,7 +11,7 @@ use gst::subclass::prelude::*;
 
 use gst_rtp::RTPBuffer;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::BTreeMap;
 use std::iter;

net/raptorq/src/raptorqenc/imp.rs

@@ -12,7 +12,7 @@ use gst::subclass::prelude::*;
 use gst_rtp::rtp_buffer::*;
 use gst_rtp::RTPBuffer;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use std::collections::HashSet;
 use std::sync::{mpsc, Mutex};

net/reqwest/Cargo.toml

@@ -17,6 +17,7 @@ mime = "0.3"
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 tokio = { version = "1.0", default-features = false, features = ["time", "rt-multi-thread"] }
+once_cell = "1"
 
 [dev-dependencies]
 hyper = { version = "0.14", features = ["server"] }

net/reqwest/src/reqwesthttpsrc/imp.rs

@@ -17,7 +17,7 @@ use reqwest::{Client, Response, StatusCode};
 use tokio::runtime;
 use url::Url;
 
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use gst::glib;
 use gst::prelude::*;

net/rtp/Cargo.toml

@@ -13,6 +13,7 @@ bitstream-io = "2.0"
 gst      = { package = "gstreamer",      git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"] }
 gst-rtp  = { package = "gstreamer-rtp",  git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"]}
 chrono = { version = "0.4", default-features = false }
+once_cell = "1"
 
 [dev-dependencies]
 gst-check = { package = "gstreamer-check",  git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"] }

net/rtp/src/av1/common/obu.rs

@@ -232,7 +232,7 @@ impl From<ObuType> for u8 {
 mod tests {
     use super::*;
     use bitstream_io::{BigEndian, BitRead, BitReader};
-    use gst::glib::once_cell::sync::Lazy;
+    use once_cell::sync::Lazy;
     use std::io::Cursor;
 
     #[allow(clippy::type_complexity)]

net/rtp/src/av1/depay/imp.rs

@@ -17,7 +17,7 @@ use std::{
 };
 
 use bitstream_io::{BitReader, BitWriter};
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use crate::av1::common::{
     err_flow, leb128_size, parse_leb128, write_leb128, AggregationHeader, ObuType, SizedObu,

net/rtp/src/av1/pay/imp.rs

@@ -17,7 +17,7 @@ use std::{
 };
 
 use bitstream_io::{BitReader, BitWriter};
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 
 use crate::av1::common::{
     err_flow, leb128_size, write_leb128, ObuType, SizedObu, CLOCK_RATE, ENDIANNESS,

net/rtp/src/gcc/imp.rs

@@ -18,8 +18,8 @@
  *
  */
 use chrono::Duration;
-use gst::glib::once_cell::sync::Lazy;
 use gst::{glib, prelude::*, subclass::prelude::*};
+use once_cell::sync::Lazy;
 use std::{
     collections::{BTreeMap, VecDeque},
     fmt,

net/webrtc/Cargo.toml

@@ -57,6 +57,7 @@ livekit-api = { version = "0.3", default-features = false, features = ["signal-c
 warp = "0.3"
 crossbeam-channel = "0.5"
 rand = "0.8"
+once_cell = "1"
 
 [dev-dependencies]
 tracing = { version = "0.1", features = ["log"] }

net/webrtc/src/aws_kvs_signaller/imp.rs

@@ -8,9 +8,9 @@ use async_tungstenite::tungstenite::Message as WsMessage;
 use futures::channel::mpsc;
 use futures::prelude::*;
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::glib::prelude::*;
 use gst::subclass::prelude::*;
+use once_cell::sync::Lazy;
 use std::path::PathBuf;
 use std::sync::Mutex;
 use tokio::task;

net/webrtc/src/janusvr_signaller/imp.rs

@@ -9,11 +9,11 @@ use futures::channel::mpsc;
 use futures::sink::SinkExt;
 use futures::stream::StreamExt;
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::glib::Properties;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use http::Uri;
+use once_cell::sync::Lazy;
 use rand::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::ops::ControlFlow;

net/webrtc/src/lib.rs

@@ -11,7 +11,7 @@
  * Since: plugins-rs-0.9
  */
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 use tokio::runtime;
 
 mod aws_kvs_signaller;

net/webrtc/src/livekit_signaller/imp.rs

@@ -8,9 +8,9 @@ use crate::RUNTIME;
 use anyhow::anyhow;
 use futures::executor::block_on;
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
+use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};

net/webrtc/src/signaller/iface.rs

@@ -1,8 +1,8 @@
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::glib::subclass::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
+use once_cell::sync::Lazy;
 
 #[derive(Copy, Clone)]
 #[repr(C)]

net/webrtc/src/signaller/imp.rs

@@ -8,10 +8,10 @@ use async_tungstenite::tungstenite::Message as WsMessage;
 use futures::channel::mpsc;
 use futures::prelude::*;
 use gst::glib;
-use gst::glib::once_cell::sync::Lazy;
 use gst::glib::prelude::*;
 use gst::subclass::prelude::*;
 use gst_plugin_webrtc_protocol as p;
+use once_cell::sync::Lazy;
 use std::collections::HashSet;
 use std::ops::ControlFlow;
 use std::str::FromStr;

net/webrtc/src/signaller/mod.rs

@@ -8,7 +8,7 @@ use gst::glib;
  *
  * Interface that WebRTC elements can implement their own protocol with.
  */
-use gst::glib::once_cell::sync::Lazy;
+use once_cell::sync::Lazy;
 // Expose traits and objects from the module itself so it exactly looks like
 // generated bindings
 pub use imp::WebRTCSignallerRole;