Update gstreamer crates to 0.22

servo · Mar 1, 2024 · a5a1094 · a5a1094
1 parent 5f39913
commit a5a1094
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 129 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,14 +39,14 @@ fxhash = "0.2"
 getopts = "0.2.11"
 gfx_traits = { path = "components/shared/gfx" }
 gleam = "0.15"
-glib = "0.18"
-gstreamer = { version = "0.21", features = ["v1_18"] }
-gstreamer-base = "0.21"
-gstreamer-gl = "0.21"
-gstreamer-gl-sys = { version = "0.21" }
-gstreamer-gl-wayland = { version = "0.21" }
-gstreamer-sys = "0.21"
-gstreamer-video = "0.21"
+glib = "0.19"
+gstreamer = { version = "0.22", features = ["v1_18"] }
+gstreamer-base = "0.22"
+gstreamer-gl = "0.22"
+gstreamer-gl-sys = { version = "0.22" }
+gstreamer-gl-wayland = { version = "0.22" }
+gstreamer-sys = "0.22"
+gstreamer-video = "0.22"
 headers = "0.3"
 html5ever = "0.26"
 http = "0.2"
@@ -91,6 +91,9 @@ selectors = { git = "https://github.com/servo/stylo.git", branch = "2023-07-23"
 serde = "1.0.197"
 serde_bytes = "0.11"
 serde_json = "1.0"
+servo-media = { git = "https://github.com/servo/media" }
+servo-media-dummy = { git = "https://github.com/servo/media" }
+servo-media-gstreamer = { git = "https://github.com/servo/media" }
 servo_arc = { git = "https://github.com/servo/stylo.git", branch = "2023-07-23" }
 servo_atoms = { git = "https://github.com/servo/stylo.git", branch = "2023-07-23" }
 size_of_test = { git = "https://github.com/servo/stylo.git", branch = "2023-07-23" }

diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
@@ -36,7 +36,7 @@ pixels = { path = "../pixels" }
 profile_traits = { workspace = true }
 script_traits = { workspace = true }
 servo_config = { path = "../config" }
-servo-media = { git = "https://github.com/servo/media" }
+servo-media = { workspace = true }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }
 style_traits = { workspace = true }

diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml
@@ -17,7 +17,7 @@ ipc-channel = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
-servo-media = { git = "https://github.com/servo/media" }
+servo-media = { workspace = true }
 servo_config = { path = "../config" }
 webrender_api = { workspace = true }
 webrender_traits = { workspace = true }
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -91,7 +91,7 @@ script_traits = { workspace = true }
 selectors = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_bytes = { workspace = true }
-servo-media = { git = "https://github.com/servo/media" }
+servo-media = { workspace = true }
 servo_allocator = { path = "../allocator" }
 servo_arc = { workspace = true }
 servo_atoms = { workspace = true }

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -65,9 +65,9 @@ profile_traits = { workspace = true }
 script = { path = "../script" }
 script_layout_interface = { workspace = true }
 script_traits = { workspace = true }
-servo-media = { git = "https://github.com/servo/media" }
-servo-media-dummy = { git = "https://github.com/servo/media" }
-servo-media-gstreamer = { git = "https://github.com/servo/media", optional = true }
+servo-media = { workspace = true }
+servo-media-dummy = { workspace = true }
+servo-media-gstreamer = { workspace = true, optional = true }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
 servo_url = { path = "../url" }

diff --git a/ports/jniapi/Cargo.toml b/ports/jniapi/Cargo.toml
@@ -23,7 +23,7 @@ libloading = "0.8"
 libservo = { path = "../../components/servo" }
 log = { workspace = true }
 serde_json = { workspace = true }
-servo-media = { git = "https://github.com/servo/media" }
+servo-media = { workspace = true }
 surfman = { workspace = true, features = ["sm-angle-default"] }
 webxr = { git = "https://github.com/servo/webxr" }
 

diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
@@ -70,7 +70,7 @@ libc = { workspace = true }
 libservo = { path = "../../components/servo" }
 log = { workspace = true }
 raw-window-handle = "0.5"
-servo-media = { git = "https://github.com/servo/media" }
+servo-media = { workspace = true }
 shellwords = "1.0.0"
 surfman = { workspace = true, features = ["sm-x11", "sm-raw-window-handle"] }
 tinyfiledialogs = "3.0"

diff --git a/support/filterlock/Cargo.toml b/support/filterlock/Cargo.toml
@@ -9,4 +9,4 @@ license = "MPL-2.0"
 
 [dependencies]
 serde = { version = "1.0.194", features = ["derive"] }
-toml = { version = "0.8.8", features = ["preserve_order"] }
+toml = { version = "0.8.9", features = ["preserve_order"] }