diff --git a/Cargo.lock b/Cargo.lock index 01df9f5..593c1b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -519,7 +519,7 @@ dependencies = [ [[package]] name = "gst-meet" -version = "0.2.2" +version = "0.3.0" dependencies = [ "anyhow", "cocoa", @@ -527,6 +527,7 @@ dependencies = [ "futures", "glib", "gstreamer", + "http", "lib-gst-meet", "structopt", "tokio", @@ -706,8 +707,9 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "jid" -version = "0.9.2" -source = "git+https://gitlab.com/xmpp-rs/xmpp-rs.git#e8359cffdc8a4596b23b4b7b3aecaf053bb46840" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30072424f12a86ea4325cf6ab6ac4b3a1c15554563719672edf734bc8bc8870b" dependencies = [ "minidom", ] @@ -858,7 +860,8 @@ dependencies = [ [[package]] name = "minidom" version = "0.14.0" -source = "git+https://gitlab.com/xmpp-rs/xmpp-rs.git#e8359cffdc8a4596b23b4b7b3aecaf053bb46840" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30565dc73d2f452e92e07ba1bdc0222efe5d1594586d19292de8ad8e53fdd031" dependencies = [ "quick-xml", ] @@ -2129,8 +2132,9 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "xmpp-parsers" -version = "0.18.1" -source = "git+https://gitlab.com/xmpp-rs/xmpp-rs.git#e8359cffdc8a4596b23b4b7b3aecaf053bb46840" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a247b69c3c5c8cf1b768fe46dd3dc5f5c0df581fe62083d6c7f267dd2a316352" dependencies = [ "base64", "blake2", diff --git a/Cargo.toml b/Cargo.toml index 1f7e36e..70100e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,3 @@ members = [ "nice-gst-meet-sys", "jitsi-xmpp-parsers", ] - -[patch.crates-io] -jid = { git = "https://gitlab.com/xmpp-rs/xmpp-rs.git" } -minidom = { git = "https://gitlab.com/xmpp-rs/xmpp-rs.git" } diff --git a/gst-meet/Cargo.toml b/gst-meet/Cargo.toml index e7fc57c..b7ad741 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.2.2" +version = "0.3.0" edition = "2018" license = "MIT/Apache-2.0" authors = ["Jasper Hugo "] @@ -12,6 +12,7 @@ colibri = { version = "0.1", default-features = false } futures = { version = "0.3", default-features = false } glib = { version = "0.15", default-features = false, features = ["log"] } gstreamer = { version = "0.18", default-features = false, features = ["v1_20"] } +http = { version = "0.2", default-features = false } lib-gst-meet = { version = "0.5", path = "../lib-gst-meet", default-features = false, features = ["tracing-subscriber"] } structopt = { version = "0.3", default-features = false } tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread", "signal", "sync", "time"] } diff --git a/jitsi-xmpp-parsers/Cargo.toml b/jitsi-xmpp-parsers/Cargo.toml index 96036b9..cec0438 100644 --- a/jitsi-xmpp-parsers/Cargo.toml +++ b/jitsi-xmpp-parsers/Cargo.toml @@ -12,7 +12,7 @@ authors = ["Jasper Hugo "] [dependencies] jid = { version = "0.9", default-features = false, features = ["minidom"] } minidom = { version = "0.14", default-features = false } -xmpp-parsers = { git = "https://gitlab.com/xmpp-rs/xmpp-rs.git", default-features = false, features = ["disable-validation"] } +xmpp-parsers = { version = "0.19", default-features = false, features = ["disable-validation"] } [package.metadata.docs.rs] rustdoc-args = [ "--sort-modules-by-appearance", "-Zunstable-options" ] diff --git a/lib-gst-meet/Cargo.toml b/lib-gst-meet/Cargo.toml index 7212a0f..e4e5706 100644 --- a/lib-gst-meet/Cargo.toml +++ b/lib-gst-meet/Cargo.toml @@ -50,7 +50,7 @@ tracing-subscriber = { version = "0.3", optional = true, default-features = fals ] } uuid = { version = "0.8", default-features = false, features = ["v4"] } webpki-roots = { version = "0.22", default-features = false, optional = true } -xmpp-parsers = { git = "https://gitlab.com/xmpp-rs/xmpp-rs.git", default-features = false, features = ["disable-validation"] } +xmpp-parsers = { version = "0.19", default-features = false, features = ["disable-validation"] } [features] # Ideally we would enable rustls/dangerous_configuration only when tls-insecure is enabled, but until weak-dep-features is stabilised, that