Start moving toward workspace dependencies

This will make it easier to upgrade GStreamer in the future.
servo · Nov 18, 2023 · 4ed8ead · 4ed8ead
1 parent 354a187
commit 4ed8ead
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,25 @@ members = [
 ]
 
 [workspace.dependencies]
+glib = "0.18"
+glib-sys = "0.18"
+gst = { package = "gstreamer", version = "0.21" }
+gst-app = { package = "gstreamer-app", version = "0.21" }
+gst-audio = { package = "gstreamer-audio", version = "0.21" }
+gst-base = { package = "gstreamer-base", version = "0.21" }
+gst-gl = { package = "gstreamer-gl", version = "0.21" }
+gst-player = { package = "gstreamer-player", version = "0.21" }
+gst-sdp = { package = "gstreamer-sdp", version = "0.21" }
+gst-video = { package = "gstreamer-video", version = "0.21" }
+gst-webrtc = { package = "gstreamer-webrtc", version = "0.21", features = ["v1_18"] }
+gstreamer-gl-egl = { version = "0.21" }
+gstreamer-gl-wayland = { version = "0.21" }
+gstreamer-gl-x11 = { version = "0.21" }
+gstreamer-sys = "0.21"
 ipc-channel = "0.18"
+sm-gst-render = { package = "servo-media-gstreamer-render", path = "../render" }
+sm-player = { package = "servo-media-player", path = "../../../player" }
+
 
 [patch."https://github.com/servo/webrender"]
 webrender = { git = "https://github.com/jdm/webrender", branch = "crash-backtrace" }

diff --git a/backends/gstreamer/Cargo.toml b/backends/gstreamer/Cargo.toml
@@ -13,15 +13,15 @@ boxfnonce = "0.1.0"
 byte-slice-cast = "0.2"
 glib = "0.18"
 glib-sys = "0.18"
-gst = { package = "gstreamer", version = "0.21" }
-gst-app = { package = "gstreamer-app", version = "0.21" }
-gst-audio = { package = "gstreamer-audio", version = "0.21" }
-gst-video = { package = "gstreamer-video", version = "0.21" }
-gst-base = { package = "gstreamer-base", version = "0.21" }
-gst-player = { package = "gstreamer-player", version = "0.21" }
-gst-webrtc = { package = "gstreamer-webrtc", version = "0.21", features = ["v1_18"] }
-gst-sdp = { package = "gstreamer-sdp", version = "0.21" }
-gstreamer-sys = "0.21"
+gst = { workspace = true }
+gst-app = { workspace = true }
+gst-audio = { workspace = true }
+gst-video = { workspace = true }
+gst-base = { workspace = true }
+gst-player = { workspace = true }
+gst-webrtc = { workspace = true }
+gst-sdp = { workspace = true }
+gstreamer-sys = { workspace = true }
 ipc-channel = { workspace = true }
 lazy_static = "1.2.0"
 log = "0.4"

diff --git a/backends/gstreamer/render-android/Cargo.toml b/backends/gstreamer/render-android/Cargo.toml
@@ -9,10 +9,10 @@ name = "servo_media_gstreamer_render_android"
 path = "lib.rs"
 
 [dependencies]
-glib = "0.18"
-gst = { package = "gstreamer", version = "0.21" }
-gst-gl = { package = "gstreamer-gl", version = "0.21" }
-gstreamer-gl-egl = { package = "gstreamer-gl-egl", version = "0.21" }
-gst-video = { package = "gstreamer-video", version = "0.21" }
+glib = { workspace = true }
+gst = { workspace = true }
+gst-gl = { workspace = true }
+gstreamer-gl-egl = { workspace = true }
+gst-video = { workspace = true }
 sm-player = { package = "servo-media-player", path = "../../../player" }
 sm-gst-render = { package = "servo-media-gstreamer-render", path = "../render" }
diff --git a/backends/gstreamer/render-unix/Cargo.toml b/backends/gstreamer/render-unix/Cargo.toml
@@ -15,11 +15,11 @@ path = "lib.rs"
 
 [dependencies]
 glib = "0.18"
-gst = { package = "gstreamer", version = "0.21" }
-gst-gl = { package = "gstreamer-gl", version = "0.21" }
-gstreamer-gl-egl = { version = "0.21", optional = true }
-gstreamer-gl-x11 = { version = "0.21", optional = true }
-gstreamer-gl-wayland = { version = "0.21", optional = true }
+gst = { workspace = true }
+gst-gl = { workspace = true }
+gstreamer-gl-egl = { workspace = true, optional = true }
+gstreamer-gl-x11 = { workspace = true, optional = true }
+gstreamer-gl-wayland = { workspace = true, optional = true }
 gst-video = { package = "gstreamer-video", version = "0.21" }
 sm-player = { package = "servo-media-player", path = "../../../player" }
 sm-gst-render = { package = "servo-media-gstreamer-render", path = "../render" }
diff --git a/backends/gstreamer/render/Cargo.toml b/backends/gstreamer/render/Cargo.toml
@@ -8,8 +8,8 @@ name = "servo_media_gstreamer_render"
 path = "lib.rs"
 
 [dependencies]
-gst = { package = "gstreamer", version = "0.21" }
-gst-video = { package = "gstreamer-video", version = "0.21" }
+gst = { workspace = true }
+gst-video = { workspace = true }
 
 [dependencies.sm-player]
 package = "servo-media-player"