diff --git a/Cargo.lock b/Cargo.lock index 250e74f92a05..f9ad33f74046 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -335,7 +335,7 @@ dependencies = [ "bitflags 2.4.2", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.10.5", "lazy_static", "lazycell", "log", @@ -2048,15 +2048,15 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2094,9 +2094,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.18.5" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" dependencies = [ "bitflags 2.4.2", "futures-channel", @@ -2110,20 +2110,18 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.5" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" +checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck", - "proc-macro-crate 2.0.1", - "proc-macro-error", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.50", @@ -2131,9 +2129,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -2168,9 +2166,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -2218,9 +2216,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.21.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de95703f4c8e79f4f4e42279cf1ab0e5a46b7ece4a9dfcd16424164af7be9055" +checksum = "48a5e10c539f8b594c50f6cd1bd1cd07785e06d701a077bff397ad211bc92e88" dependencies = [ "cfg-if", "futures-channel", @@ -2233,19 +2231,19 @@ dependencies = [ "muldiv", "num-integer", "num-rational", + "once_cell", "option-operations", "paste", "pin-project-lite", - "pretty-hex", "smallvec", "thiserror", ] [[package]] name = "gstreamer-app" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16bc8090a8806193237e7b6531ee429ff6e39686425f5c3eb06dfa75875390fb" +checksum = "50184e88d3462a796a5924fb329839c102b22f9383c1636323fa4ef5255dea92" dependencies = [ "futures-core", "futures-sink", @@ -2258,9 +2256,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aea07f07a3f17278e6998390ecaea127e476f0af0360c2d83d96e6d3a97fb75e" +checksum = "6771c0939f286fb261525494a0aad29435b37e802284756bab24afe3bbca7476" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -2271,9 +2269,9 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.21.3" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a97c8a4e9c889b4a7b2feda4be70edc5c3e012ddbf97928cf0a020ca1e4212d" +checksum = "e7529f913cb6cbf1305ebc58ace01391cf9bb5a833810cf6e7c09e9a37d130f2" dependencies = [ "cfg-if", "glib", @@ -2281,13 +2279,15 @@ dependencies = [ "gstreamer-audio-sys", "gstreamer-base", "libc", + "once_cell", + "smallvec", ] [[package]] name = "gstreamer-audio-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bd94ae8b177377855b38c3d809c686526786cdb771e6d68510509634b955d1" +checksum = "34d92a1e2a915874f70f0a33c3ea4589bc6b66a138b6ec8bb6acedf49bdec2c3" dependencies = [ "glib-sys", "gobject-sys", @@ -2299,9 +2299,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb150b6904a49052237fede7cc2e6479df6ced5043d95e6af8134bc141a3167f" +checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" dependencies = [ "atomic_refcell", "cfg-if", @@ -2313,9 +2313,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ca701f9078fe115b29b24c80910b577f9cb5b039182f050dbadf5933594b64" +checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" dependencies = [ "glib-sys", "gobject-sys", @@ -2326,9 +2326,9 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ecfb91128263c160448a915a15e430cfdc69317b1b087316222e0693bb51b90" +checksum = "7d21c0c5fbf74018a0254b3ab77bca0a5b2c0f002bcfd910c09113ae90a95d98" dependencies = [ "glib", "gstreamer", @@ -2336,13 +2336,14 @@ dependencies = [ "gstreamer-gl-sys", "gstreamer-video", "libc", + "once_cell", ] [[package]] name = "gstreamer-gl-egl" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a173ab223aa3c46d5f2be02b494c2086096fa3e932e2953d6392fcc07da5dc82" +checksum = "dfde7bf67f5f7c87e1ff29cdeea4918530d677b51e3f4847121ada44f1fab139" dependencies = [ "glib", "gstreamer", @@ -2353,9 +2354,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-egl-sys" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee3c88b6f01c8a5f9f7ba39f9805ac7026fd269fccb04d2a4b488bb928a8e954" +checksum = "7c9ec3c03af5d4ed3e58ddbca4eea13e90e01b88e37f6c0689b26e05168eb7bf" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2365,9 +2366,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580971b3c99a667c9739812d499e6c5cadbb92873f984cd0d1d0b4e7346f1cd" +checksum = "61d1e3b9b02abc23835e9d770f2bd705b67a50406ea37e963b4526a77c6a7cd8" dependencies = [ "glib-sys", "gobject-sys", @@ -2380,9 +2381,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7021b9e32c9d2c2830898cfdb60f8b1e7fea560b7cd3e221b9fad01a32af67d" +checksum = "42ed82941c84668d89dbf81f220083422268c22ec6ab4991806649ed6758cec8" dependencies = [ "glib", "gstreamer", @@ -2393,9 +2394,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11-sys" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49aef03c7b9e159b5f4c557efe4a597437ea6e5e10f934ae8b214386c6ebcdc" +checksum = "54b59f2782f5e71e3ef5fd534598938966a4dc3911f2540807f7d13b586e4ed1" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2405,9 +2406,9 @@ dependencies = [ [[package]] name = "gstreamer-player" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276900527b2f8323c6ed97ab3ed42854bb169a993fb8cef946fb43d1e9097a66" +checksum = "5950d1d194935b27a0b2af99afe83dc9697149a1b55230f16c51eefe798c4a51" dependencies = [ "glib", "gstreamer", @@ -2418,9 +2419,9 @@ dependencies = [ [[package]] name = "gstreamer-player-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ef4d00b43d0aa94e9a518e6ef4a4c504b4b855304a0a5f4ed1493d5e5ca66c" +checksum = "e0ff7af3d3c4692a36ce1c4695b2a3a6563d8e5724feded38def679bd755202f" dependencies = [ "glib-sys", "gobject-sys", @@ -2432,9 +2433,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87946f9c6fabb44a73fb0b3b3d611c7d4468f741dd8e4f9a3d54e1ab2a6a8b36" +checksum = "2f9aa459d119aa787efc18edcc591736e1e6cd488835825d1807532456ba2dbd" dependencies = [ "glib", "gstreamer", @@ -2443,9 +2444,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e4bdf4618c70a2cb440ca4adf1a4140fc118b1b314684903a48f0ef5e1da1" +checksum = "5d80dfc4811c67ca66586b4e470f85ab25aca4ea92bd2ba2665552c1dd0e5609" dependencies = [ "glib-sys", "gstreamer-sys", @@ -2455,9 +2456,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.21.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564cda782b3e6eed1b81cb4798a06794db56440fb05b422505be689f34ce3bc4" +checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" dependencies = [ "glib-sys", "gobject-sys", @@ -2467,9 +2468,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.21.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85b2a4d1d3b7a98ae03806c3ed5c2db89d6b37a5f138780b48de015d68715e5" +checksum = "5ab3f4045ddb92bf2b469f5db8825d4f5eb46e4beff661fc97f50bb4e2b2c626" dependencies = [ "cfg-if", "futures-channel", @@ -2478,14 +2479,15 @@ dependencies = [ "gstreamer-base", "gstreamer-video-sys", "libc", + "once_cell", "thiserror", ] [[package]] name = "gstreamer-video-sys" -version = "0.21.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302318d98e6b054501e485b6bb4ee20225823218f4a8660c182f115a33b16ee" +checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" dependencies = [ "glib-sys", "gobject-sys", @@ -2497,9 +2499,9 @@ dependencies = [ [[package]] name = "gstreamer-webrtc" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7200f2eb49d609afcb3e064b1ba75cbd041012a1855ea921b222e772634ff370" +checksum = "8c4b120a15362865dedc4417ca605dd734f5699b75f42cfef08a9140dd333426" dependencies = [ "glib", "gstreamer", @@ -2510,9 +2512,9 @@ dependencies = [ [[package]] name = "gstreamer-webrtc-sys" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32df9bf9d801e6f874de2476fd3dcf2a1ca9247e8979bd4de034a45fd399663" +checksum = "8968383c25abb00bdc434d21d92947654e3656503ccb24c8f1218cd96342c073" dependencies = [ "glib-sys", "gstreamer-sdp-sys", @@ -4443,12 +4445,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" -[[package]] -name = "pretty-hex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" - [[package]] name = "prettyplease" version = "0.2.16" @@ -4472,38 +4468,13 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_datetime", "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -5220,7 +5191,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "once_cell", "servo-media-audio", @@ -5233,7 +5204,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.2.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "byte-slice-cast", "euclid", @@ -5254,7 +5225,7 @@ dependencies = [ [[package]] name = "servo-media-derive" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "proc-macro2", "quote", @@ -5264,7 +5235,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "ipc-channel", "servo-media", @@ -5278,7 +5249,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "byte-slice-cast", "glib", @@ -5312,7 +5283,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "gstreamer", "gstreamer-video", @@ -5322,7 +5293,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-android" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "glib", "gstreamer", @@ -5336,7 +5307,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer-render-unix" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "glib", "gstreamer", @@ -5351,7 +5322,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "ipc-channel", "serde", @@ -5363,7 +5334,7 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "lazy_static", "uuid", @@ -5372,12 +5343,12 @@ dependencies = [ [[package]] name = "servo-media-traits" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#a77995f1c8fe7d221ce3afef8bd8b92342e42321" +source = "git+https://github.com/servo/media#c04bb3025320cf8cd75ecf00ab8cacb39ff81843" dependencies = [ "lazy_static", "log", @@ -6003,7 +5974,7 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.2", + "toml 0.8.9", "version-compare", ] @@ -6333,9 +6304,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" dependencies = [ "serde", "serde_spanned", @@ -6345,18 +6316,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.2.3", "serde", diff --git a/Cargo.toml b/Cargo.toml index c9abefd86bbb..f87861810218 100644 --- 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 index 10c651bcb81f..e1c0f0c7042c 100644 --- 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 index a63c108fcacd..9691d9893120 100644 --- 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 index b9e9ff1249cc..a9d2d52b94ea 100644 --- 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 index 7fed4386d642..745fe7af15d2 100644 --- 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 index 3e451b239814..533769a913b2 100644 --- 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 index 432712ca626c..825c43bf88cd 100644 --- 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 index 048110ed0639..8db326057556 100644 --- 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"] }