From ddcd335e44c252bc76e931cf224d53ec82f780b5 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 20 Feb 2015 13:00:21 -0800 Subject: [PATCH 1/2] Add `rust-media` as a dependency of script, in preparation for audio and video tag support. This does not actually use the library; it's just here to prevent bitrotting. --- components/media/Cargo.toml | 12 ++++++++ components/media/lib.rs | 8 +++++ components/script/Cargo.toml | 3 ++ components/servo/Cargo.lock | 60 ++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+) create mode 100644 components/media/Cargo.toml create mode 100644 components/media/lib.rs diff --git a/components/media/Cargo.toml b/components/media/Cargo.toml new file mode 100644 index 000000000000..9fb51a1c3241 --- /dev/null +++ b/components/media/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "media" +version = "0.0.1" +authors = ["The Servo Project Developers"] + +[lib] +name = "media" +path = "lib.rs" + +[dependencies.rust-media] +git = "https://github.com/pcwalton/rust-media" + diff --git a/components/media/lib.rs b/components/media/lib.rs new file mode 100644 index 000000000000..7db4339aba5e --- /dev/null +++ b/components/media/lib.rs @@ -0,0 +1,8 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +extern crate "rust-media" as rust_media; + +// Just a stub for now. + diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 62a44c31109b..d95e74206d8c 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -39,6 +39,9 @@ path = "../gfx" [dependencies.canvas] path = "../canvas" +[dependencies.media] +path = "../media" + [dependencies.cssparser] git = "https://github.com/servo/rust-cssparser" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 018ae7f86bd5..ab2c93b1b1e8 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -126,6 +126,11 @@ name = "core_foundation" version = "0.1.0" source = "git+https://github.com/servo/rust-core-foundation#da9a52655fce4727dcf261d6ed9a49eeddc7b131" +[[package]] +name = "core_foundation" +version = "0.1.0" +source = "git+https://github.com/servo/rust-core-foundation?rev=da9a52655fce4727dcf261d6ed9a49eeddc7b131#da9a52655fce4727dcf261d6ed9a49eeddc7b131" + [[package]] name = "core_graphics" version = "0.1.0" @@ -326,6 +331,11 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "giflib-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/giflib#7cce2d216f68ad2ae773fde15c53e90b6687429b" + [[package]] name = "gl_common" version = "0.0.4" @@ -554,6 +564,16 @@ dependencies = [ "pnacl-build-helper 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libvpx-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/libvpx?branch=servo#90d2750900d72ee20b2f99bdfb33b2c725e585b8" + +[[package]] +name = "libwebm-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/libwebm?branch=servo#a3f20c3da760c6c423840a9d8ddad66f9fdfb37a" + [[package]] name = "log" version = "0.2.2" @@ -564,6 +584,13 @@ name = "matches" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "media" +version = "0.0.1" +dependencies = [ + "rust-media 0.1.0 (git+https://github.com/pcwalton/rust-media)", +] + [[package]] name = "mime" version = "0.0.8" @@ -582,6 +609,11 @@ name = "mozjs-sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#056e1d953b95d7a9545d514cf95772a0a1c69bb2" +[[package]] +name = "mp4v2-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/mp4v2?branch=servo#08458b72a063b5fbd0e7398edd19d17f348a946b" + [[package]] name = "msg" version = "0.0.1" @@ -619,6 +651,11 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "ogg-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/ogg?branch=servo#3c1758b277863d198926cc9d59e8c37c9a784bd1" + [[package]] name = "openssl" version = "0.3.2" @@ -696,6 +733,20 @@ dependencies = [ "log 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rust-media" +version = "0.1.0" +source = "git+https://github.com/pcwalton/rust-media#8a428094b529de2d5b86b9246934def039dc0f4d" +dependencies = [ + "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation?rev=da9a52655fce4727dcf261d6ed9a49eeddc7b131)", + "giflib-sys 0.1.0 (git+https://github.com/pcwalton/giflib)", + "libvpx-sys 0.1.0 (git+https://github.com/pcwalton/libvpx?branch=servo)", + "libwebm-sys 0.1.0 (git+https://github.com/pcwalton/libwebm?branch=servo)", + "mp4v2-sys 0.1.0 (git+https://github.com/pcwalton/mp4v2?branch=servo)", + "ogg-sys 0.1.0 (git+https://github.com/pcwalton/ogg?branch=servo)", + "vorbis-sys 0.1.0 (git+https://github.com/pcwalton/vorbis?branch=servo)", +] + [[package]] name = "regex" version = "0.1.14" @@ -721,6 +772,7 @@ dependencies = [ "hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "media 0.0.1", "msg 0.0.1", "net 0.0.1", "plugins 0.0.1", @@ -892,6 +944,14 @@ dependencies = [ "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "vorbis-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/vorbis?branch=servo#82fcb8dc370f29e0c2a2ce22914adc7e60679ed1" +dependencies = [ + "ogg-sys 0.1.0 (git+https://github.com/pcwalton/ogg?branch=servo)", +] + [[package]] name = "winapi" version = "0.1.9" From 6ca104a5c285e9091c99557f9390653d23af064f Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 24 Feb 2015 18:02:13 -0800 Subject: [PATCH 2/2] Fix missing Cargo.locks --- ports/cef/Cargo.lock | 60 +++++++++++++++++++++++++++++++++++++++++++ ports/gonk/Cargo.lock | 60 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index a49f92f8f275..412880d5fe7e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -129,6 +129,11 @@ name = "core_foundation" version = "0.1.0" source = "git+https://github.com/servo/rust-core-foundation#da9a52655fce4727dcf261d6ed9a49eeddc7b131" +[[package]] +name = "core_foundation" +version = "0.1.0" +source = "git+https://github.com/servo/rust-core-foundation?rev=da9a52655fce4727dcf261d6ed9a49eeddc7b131#da9a52655fce4727dcf261d6ed9a49eeddc7b131" + [[package]] name = "core_graphics" version = "0.1.0" @@ -329,6 +334,11 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "giflib-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/giflib#7cce2d216f68ad2ae773fde15c53e90b6687429b" + [[package]] name = "gl_common" version = "0.0.4" @@ -562,6 +572,16 @@ dependencies = [ "pnacl-build-helper 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libvpx-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/libvpx?branch=servo#90d2750900d72ee20b2f99bdfb33b2c725e585b8" + +[[package]] +name = "libwebm-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/libwebm?branch=servo#a3f20c3da760c6c423840a9d8ddad66f9fdfb37a" + [[package]] name = "log" version = "0.2.2" @@ -572,6 +592,13 @@ name = "matches" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "media" +version = "0.0.1" +dependencies = [ + "rust-media 0.1.0 (git+https://github.com/pcwalton/rust-media)", +] + [[package]] name = "mime" version = "0.0.8" @@ -590,6 +617,11 @@ name = "mozjs-sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#056e1d953b95d7a9545d514cf95772a0a1c69bb2" +[[package]] +name = "mp4v2-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/mp4v2?branch=servo#08458b72a063b5fbd0e7398edd19d17f348a946b" + [[package]] name = "msg" version = "0.0.1" @@ -627,6 +659,11 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "ogg-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/ogg?branch=servo#3c1758b277863d198926cc9d59e8c37c9a784bd1" + [[package]] name = "openssl" version = "0.3.2" @@ -709,6 +746,20 @@ name = "regex" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "rust-media" +version = "0.1.0" +source = "git+https://github.com/pcwalton/rust-media#16a08f08bddee2e258ef4e8b822900c7a4091a6d" +dependencies = [ + "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation?rev=da9a52655fce4727dcf261d6ed9a49eeddc7b131)", + "giflib-sys 0.1.0 (git+https://github.com/pcwalton/giflib)", + "libvpx-sys 0.1.0 (git+https://github.com/pcwalton/libvpx?branch=servo)", + "libwebm-sys 0.1.0 (git+https://github.com/pcwalton/libwebm?branch=servo)", + "mp4v2-sys 0.1.0 (git+https://github.com/pcwalton/mp4v2?branch=servo)", + "ogg-sys 0.1.0 (git+https://github.com/pcwalton/ogg?branch=servo)", + "vorbis-sys 0.1.0 (git+https://github.com/pcwalton/vorbis?branch=servo)", +] + [[package]] name = "rustc-serialize" version = "0.2.12" @@ -729,6 +780,7 @@ dependencies = [ "hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "media 0.0.1", "msg 0.0.1", "net 0.0.1", "plugins 0.0.1", @@ -919,6 +971,14 @@ dependencies = [ "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "vorbis-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/vorbis?branch=servo#82fcb8dc370f29e0c2a2ce22914adc7e60679ed1" +dependencies = [ + "ogg-sys 0.1.0 (git+https://github.com/pcwalton/ogg?branch=servo)", +] + [[package]] name = "winapi" version = "0.1.9" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 8a8723fc71c7..6b23eb0b1769 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -99,6 +99,11 @@ name = "core_foundation" version = "0.1.0" source = "git+https://github.com/servo/rust-core-foundation#da9a52655fce4727dcf261d6ed9a49eeddc7b131" +[[package]] +name = "core_foundation" +version = "0.1.0" +source = "git+https://github.com/servo/rust-core-foundation?rev=da9a52655fce4727dcf261d6ed9a49eeddc7b131#da9a52655fce4727dcf261d6ed9a49eeddc7b131" + [[package]] name = "core_graphics" version = "0.1.0" @@ -291,6 +296,11 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "giflib-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/giflib#7cce2d216f68ad2ae773fde15c53e90b6687429b" + [[package]] name = "gl_common" version = "0.0.4" @@ -474,6 +484,16 @@ dependencies = [ "pnacl-build-helper 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libvpx-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/libvpx?branch=servo#90d2750900d72ee20b2f99bdfb33b2c725e585b8" + +[[package]] +name = "libwebm-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/libwebm?branch=servo#a3f20c3da760c6c423840a9d8ddad66f9fdfb37a" + [[package]] name = "log" version = "0.2.2" @@ -484,6 +504,13 @@ name = "matches" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "media" +version = "0.0.1" +dependencies = [ + "rust-media 0.1.0 (git+https://github.com/pcwalton/rust-media)", +] + [[package]] name = "mime" version = "0.0.8" @@ -502,6 +529,11 @@ name = "mozjs-sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#056e1d953b95d7a9545d514cf95772a0a1c69bb2" +[[package]] +name = "mp4v2-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/mp4v2?branch=servo#08458b72a063b5fbd0e7398edd19d17f348a946b" + [[package]] name = "msg" version = "0.0.1" @@ -539,6 +571,11 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "ogg-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/ogg?branch=servo#3c1758b277863d198926cc9d59e8c37c9a784bd1" + [[package]] name = "openssl" version = "0.3.2" @@ -621,6 +658,20 @@ name = "regex" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "rust-media" +version = "0.1.0" +source = "git+https://github.com/pcwalton/rust-media#16a08f08bddee2e258ef4e8b822900c7a4091a6d" +dependencies = [ + "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation?rev=da9a52655fce4727dcf261d6ed9a49eeddc7b131)", + "giflib-sys 0.1.0 (git+https://github.com/pcwalton/giflib)", + "libvpx-sys 0.1.0 (git+https://github.com/pcwalton/libvpx?branch=servo)", + "libwebm-sys 0.1.0 (git+https://github.com/pcwalton/libwebm?branch=servo)", + "mp4v2-sys 0.1.0 (git+https://github.com/pcwalton/mp4v2?branch=servo)", + "ogg-sys 0.1.0 (git+https://github.com/pcwalton/ogg?branch=servo)", + "vorbis-sys 0.1.0 (git+https://github.com/pcwalton/vorbis?branch=servo)", +] + [[package]] name = "rustc-serialize" version = "0.2.12" @@ -641,6 +692,7 @@ dependencies = [ "hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "media 0.0.1", "msg 0.0.1", "net 0.0.1", "plugins 0.0.1", @@ -822,6 +874,14 @@ dependencies = [ "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "vorbis-sys" +version = "0.1.0" +source = "git+https://github.com/pcwalton/vorbis?branch=servo#82fcb8dc370f29e0c2a2ce22914adc7e60679ed1" +dependencies = [ + "ogg-sys 0.1.0 (git+https://github.com/pcwalton/ogg?branch=servo)", +] + [[package]] name = "xlib" version = "0.1.0"