From 11ffd97d8b85e74cd7204107e6a2be1db1a701df Mon Sep 17 00:00:00 2001 From: Jasper Hugo Date: Sun, 15 Aug 2021 12:35:51 +0700 Subject: [PATCH] updated gst-meet and lib-gst-meet to 0.2.0 --- Cargo.lock | 119 +++++++++++++++++++++++++++++++++++++++- Cargo.toml | 1 + README.md | 4 +- deny.toml | 4 +- gst-meet/Cargo.toml | 4 +- lib-gst-meet/Cargo.toml | 2 +- shell.nix | 11 ++-- 7 files changed, 131 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1773477..485f2a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "async-stream" @@ -506,7 +506,7 @@ dependencies = [ "num-integer", "num-rational", "once_cell", - "paste", + "paste 1.0.5", "pretty-hex", "thiserror", ] @@ -575,6 +575,29 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + [[package]] name = "input_buffer" version = "0.4.0" @@ -678,6 +701,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "lib-gst-meet-py" +version = "0.1.0" +dependencies = [ + "anyhow", + "glib", + "lib-gst-meet", + "pyo3", + "tokio", +] + [[package]] name = "libc" version = "0.2.99" @@ -915,12 +949,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + [[package]] name = "paste" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + [[package]] name = "pem" version = "0.8.3" @@ -1022,6 +1075,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + [[package]] name = "proc-macro2" version = "1.0.28" @@ -1031,6 +1090,54 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "pyo3" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af205762ba65eec9f27a2fa1a57a40644e8e3368784b8c8b2f2de48f6e8ddd96" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste 0.1.18", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "755944027ce803c7238e59c5a18e59c1d0a4553db50b23e9ba209a568353028d" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd31b36bccfd902c78804bd96c28ea93eac6fa0ca311f9d21ef2230b6665b29a" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c21c59ba36db9c823e931c662766b0dd01a030b1d96585b67d8857a96a56b972" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + [[package]] name = "quick-xml" version = "0.20.0" @@ -1618,6 +1725,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + [[package]] name = "untrusted" version = "0.7.1" diff --git a/Cargo.toml b/Cargo.toml index 47ae19e..2c7493e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ members = [ "gst-meet", "lib-gst-meet", "lib-gst-meet-c", + "lib-gst-meet-py", "nice-gst-meet", "nice-gst-meet-sys", ] diff --git a/README.md b/README.md index bcd16f3..d02d8aa 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Thanks to GStreamer's flexibility and wide range of plugins, this enables many n You will need the dependencies `glib`, `gstreamer` and `libnice`, as well as any GStreamer plugins you want to use in your pipelines, and a Rust toolchain ([rustup](https://rustup.rs/) is the easiest way to install one). -Then: `cargo install gst-meet` +Then: `cargo install --force gst-meet` (`--force` will upgrade `gst-meet` if you have already installed it.) To integrate gst-meet into your own application, look at `lib-gst-meet`. @@ -119,4 +119,4 @@ Unless you explicitly state otherwise, any contribution intentionally submitted ## Acknowledgements -`gst-meet` development is sponsored by [AVStack](https://www.avstack.io/). We provide globally-distributed, scalable, managed Jitsi Meet backends. \ No newline at end of file +`gst-meet` development is sponsored by [AVStack](https://www.avstack.io/). We provide globally-distributed, scalable, managed Jitsi Meet backends. diff --git a/deny.toml b/deny.toml index 3aaade5..f187f86 100644 --- a/deny.toml +++ b/deny.toml @@ -36,7 +36,9 @@ highlight = "all" allow = [] deny = [] skip = [] -skip-tree = [] +skip-tree = [ + { name = "paste", version = "0.1.18", depth = 2 } +] [sources] unknown-registry = "deny" diff --git a/gst-meet/Cargo.toml b/gst-meet/Cargo.toml index f640889..43c4026 100644 --- a/gst-meet/Cargo.toml +++ b/gst-meet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "gst-meet" description = "A tool for connecting GStreamer pipelines to Jitsi Meet conferences" -version = "0.1.0" +version = "0.2.0" edition = "2018" license = "MIT/Apache-2.0" authors = ["Jasper Hugo "] @@ -26,4 +26,4 @@ tracing-subscriber = { version = "0.2", default-features = false, features = [ ] } [target.'cfg(target_os = "macos")'.dependencies] -cocoa = { version = "0.24", default-features = false } \ No newline at end of file +cocoa = { version = "0.24", default-features = false } diff --git a/lib-gst-meet/Cargo.toml b/lib-gst-meet/Cargo.toml index bd54cf0..b8993c3 100644 --- a/lib-gst-meet/Cargo.toml +++ b/lib-gst-meet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lib-gst-meet" description = "Connect GStreamer pipelines to Jitsi Meet conferences" -version = "0.1.0" +version = "0.2.0" edition = "2018" license = "MIT/Apache-2.0" authors = ["Jasper Hugo "] diff --git a/shell.nix b/shell.nix index d2d4085..e42b228 100644 --- a/shell.nix +++ b/shell.nix @@ -1,9 +1,10 @@ -{ pkgs ? import {} }: - -pkgs.mkShell { +with import {}; +mkShell { name = "gst-meet"; - buildInputs = with pkgs; [ - glib + buildInputs = [ pkg-config + glib + gst_all_1.gstreamer + libnice ]; }