From 0d2f054c15c5e400b04508bd3eed36e53e68cd73 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@asymptotic.io>
Date: Wed, 1 May 2024 18:12:12 +0530
Subject: [PATCH] Move net/quic to net/quinn

While at it, add this to meson.build.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1036>
---
 Cargo.lock                                   | 2 +-
 Cargo.toml                                   | 2 +-
 meson.build                                  | 1 +
 meson_options.txt                            | 1 +
 net/{quic => quinn}/Cargo.toml               | 4 ++--
 net/{quic => quinn}/build.rs                 | 0
 net/{quic => quinn}/src/lib.rs               | 6 +++---
 net/{quic => quinn}/src/quinnquicsink/imp.rs | 0
 net/{quic => quinn}/src/quinnquicsink/mod.rs | 0
 net/{quic => quinn}/src/quinnquicsrc/imp.rs  | 0
 net/{quic => quinn}/src/quinnquicsrc/mod.rs  | 0
 net/{quic => quinn}/src/utils.rs             | 0
 net/{quic => quinn}/tests/quinnquic.rs       | 2 +-
 13 files changed, 10 insertions(+), 8 deletions(-)
 rename net/{quic => quinn}/Cargo.toml (97%)
 rename net/{quic => quinn}/build.rs (100%)
 rename net/{quic => quinn}/src/lib.rs (94%)
 rename net/{quic => quinn}/src/quinnquicsink/imp.rs (100%)
 rename net/{quic => quinn}/src/quinnquicsink/mod.rs (100%)
 rename net/{quic => quinn}/src/quinnquicsrc/imp.rs (100%)
 rename net/{quic => quinn}/src/quinnquicsrc/mod.rs (100%)
 rename net/{quic => quinn}/src/utils.rs (100%)
 rename net/{quic => quinn}/tests/quinnquic.rs (97%)

diff --git a/Cargo.lock b/Cargo.lock
index b4e6dc6d..7654e6cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2642,7 +2642,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "gst-plugin-quic"
+name = "gst-plugin-quinn"
 version = "0.13.0-alpha.1"
 dependencies = [
  "bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 8b68ca78..0af8a443 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ members = [
     "net/webrtc",
     "net/webrtc/protocol",
     "net/webrtc/signalling",
-    "net/quic",
+    "net/quinn",
 
     "text/ahead",
     "text/json",
diff --git a/meson.build b/meson.build
index a069e709..8cf5dadb 100644
--- a/meson.build
+++ b/meson.build
@@ -205,6 +205,7 @@ plugins = {
     'extra-deps': {'cairo-gobject': []},
   },
   'gopbuffer': {'library': 'libgstgopbuffer'},
+  'quinn': {'library': 'libgstquinn'},
 }
 
 if get_option('examples').allowed()
diff --git a/meson_options.txt b/meson_options.txt
index 7d416fa6..b9305abd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,6 +34,7 @@ option('rtsp', type: 'feature', value: 'auto', description: 'Build rtsp plugin')
 option('rtp', type: 'feature', value: 'auto', description: 'Build rtp plugin')
 option('webrtc', type: 'feature', value: 'auto', yield: true, description: 'Build webrtc plugin')
 option('webrtchttp', type: 'feature', value: 'auto', description: 'Build webrtchttp plugin')
+option('quinn', type: 'feature', value: 'auto', description: 'Build quinn plugin')
 
 # text
 option('textahead', type: 'feature', value: 'auto', description: 'Build textahead plugin')
diff --git a/net/quic/Cargo.toml b/net/quinn/Cargo.toml
similarity index 97%
rename from net/quic/Cargo.toml
rename to net/quinn/Cargo.toml
index f2b486c3..a092b954 100644
--- a/net/quic/Cargo.toml
+++ b/net/quinn/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "gst-plugin-quic"
+name = "gst-plugin-quinn"
 version.workspace = true
 authors = ["Sanchayan Maity <sanchayan@asymptotic.io"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
@@ -28,7 +28,7 @@ gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org
 serial_test = "3"
 
 [lib]
-name = "gstquic"
+name = "gstquinn"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 required-features = ["tls-rustls"]
diff --git a/net/quic/build.rs b/net/quinn/build.rs
similarity index 100%
rename from net/quic/build.rs
rename to net/quinn/build.rs
diff --git a/net/quic/src/lib.rs b/net/quinn/src/lib.rs
similarity index 94%
rename from net/quic/src/lib.rs
rename to net/quinn/src/lib.rs
index f54ce6b5..6b735d67 100644
--- a/net/quic/src/lib.rs
+++ b/net/quinn/src/lib.rs
@@ -9,9 +9,9 @@
 #![allow(clippy::non_send_fields_in_send_ty, unused_doc_comments)]
 
 /**
- * plugin-quic:
+ * plugin-quinn:
  *
- * Since: plugins-rs-0.11.0
+ * Since: plugins-rs-0.13.0
  */
 use gst::glib;
 mod quinnquicsink;
@@ -26,7 +26,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
 }
 
 gst::plugin_define!(
-    quic,
+    quinn,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/net/quic/src/quinnquicsink/imp.rs b/net/quinn/src/quinnquicsink/imp.rs
similarity index 100%
rename from net/quic/src/quinnquicsink/imp.rs
rename to net/quinn/src/quinnquicsink/imp.rs
diff --git a/net/quic/src/quinnquicsink/mod.rs b/net/quinn/src/quinnquicsink/mod.rs
similarity index 100%
rename from net/quic/src/quinnquicsink/mod.rs
rename to net/quinn/src/quinnquicsink/mod.rs
diff --git a/net/quic/src/quinnquicsrc/imp.rs b/net/quinn/src/quinnquicsrc/imp.rs
similarity index 100%
rename from net/quic/src/quinnquicsrc/imp.rs
rename to net/quinn/src/quinnquicsrc/imp.rs
diff --git a/net/quic/src/quinnquicsrc/mod.rs b/net/quinn/src/quinnquicsrc/mod.rs
similarity index 100%
rename from net/quic/src/quinnquicsrc/mod.rs
rename to net/quinn/src/quinnquicsrc/mod.rs
diff --git a/net/quic/src/utils.rs b/net/quinn/src/utils.rs
similarity index 100%
rename from net/quic/src/utils.rs
rename to net/quinn/src/utils.rs
diff --git a/net/quic/tests/quinnquic.rs b/net/quinn/tests/quinnquic.rs
similarity index 97%
rename from net/quic/tests/quinnquic.rs
rename to net/quinn/tests/quinnquic.rs
index 5a6809ec..d8d52b87 100644
--- a/net/quic/tests/quinnquic.rs
+++ b/net/quinn/tests/quinnquic.rs
@@ -17,7 +17,7 @@ fn init() {
 
     INIT.call_once(|| {
         gst::init().unwrap();
-        gstquic::plugin_register_static().expect("QUIC source sink send receive tests");
+        gstquinn::plugin_register_static().expect("QUIC source sink send receive tests");
     });
 }