From b9f8905b218a46d9e7b88262a3cadd50457a4c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sun, 14 Aug 2016 15:45:34 -0700 Subject: [PATCH] script: Disable our dependency in ffmpeg until the media madness is over. --- README.md | 21 ++++---------- components/script/Cargo.toml | 3 -- components/script/dom/htmlmediaelement.rs | 28 ++----------------- components/script/lib.rs | 2 -- components/servo/Cargo.lock | 12 -------- ports/cef/Cargo.lock | 12 -------- .../media-elements/error-codes/error.html.ini | 6 ---- .../media-elements/event_loadeddata.html.ini | 3 -- .../event_loadeddata_noautoplay.html.ini | 6 ---- .../event_loadedmetadata.html.ini | 6 ---- .../event_loadedmetadata_noautoplay.html.ini | 6 ---- ...t_order_loadedmetadata_loadeddata.html.ini | 6 ---- .../readyState_during_loadeddata.html.ini | 6 ---- .../readyState_during_loadedmetadata.html.ini | 6 ---- 14 files changed, 8 insertions(+), 115 deletions(-) delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini delete mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini diff --git a/README.md b/README.md index 9830932e4c7..3c8ed121bd7 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ Please select your operating system: #### On OS X (homebrew) ``` sh -brew install automake pkg-config python cmake ffmpeg +brew install automake pkg-config python cmake pip install virtualenv ``` #### On OS X (MacPorts) ``` sh -sudo port install python27 py27-virtualenv cmake ffmpeg +sudo port install python27 py27-virtualenv cmake ``` #### On OS X 10.11 (El Capitan), you also have to install openssl @@ -53,16 +53,6 @@ export DEP_OPENSSL_INCLUDE=/usr/local/include ./mach build ... ``` -If you get this error: -``` sh -"Couldn't find libavformat", do the following: - -brew uninstall ffmpeg -brew install ffmpeg --build-from-source -./mach clean -./mach build -``` - If you've already partially compiled servo but forgot to do this step, run ./mach clean, link openssl, and recompile. #### On Debian-based Linuxes @@ -72,8 +62,7 @@ sudo apt-get install git curl freeglut3-dev autoconf \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ gperf g++ build-essential cmake virtualenv python-pip \ libssl-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \ - libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev \ - libavformat-dev + libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev ``` If you are on **Ubuntu 14.04** and encountered errors on installing these dependencies involving `libcheese`, see [#6158](https://github.com/servo/servo/issues/6158) for a workaround. @@ -86,7 +75,7 @@ sudo dnf install curl freeglut-devel libtool gcc-c++ libXi-devel \ freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \ fontconfig-devel cabextract ttmkfdir python python-virtualenv python-pip expat-devel \ rpm-build openssl-devel cmake bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \ - dbus-devel ffmpeg-devel + dbus-devel ``` #### On Arch Linux @@ -116,7 +105,7 @@ pacman -Su pacman -Sy git mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype \ mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates \ mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch \ - patchutils make python2-setuptools mingw-w64-x86_64-ffmpeg + patchutils make python2-setuptools export GCC_URL=http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc export GCC_EXT=5.4.0-1-any.pkg.tar.xz pacman -U --noconfirm $GCC_URL-$GCC_EXT $GCC_URL-ada-$GCC_EXT \ diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 2799b9bc4a4..ba10b07bc3d 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -20,9 +20,6 @@ cmake = "0.1" [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies] tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"} -[target.'cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))'.dependencies] -video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"} - [dependencies] angle = {git = "https://github.com/servo/angle", branch = "servo"} app_units = "0.3" diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 1c7a27fcef6..d26ac6a044e 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -36,8 +36,6 @@ use string_cache::Atom; use task_source::TaskSource; use time::{self, Timespec, Duration}; use url::Url; -#[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))] -use video_metadata; struct HTMLMediaElementContext { /// The element that initiated the request. @@ -161,31 +159,11 @@ impl HTMLMediaElementContext { } } - #[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))] - fn check_metadata(&mut self, elem: &HTMLMediaElement) { - match video_metadata::get_format_from_slice(&self.data) { - Ok(meta) => { - let dur = meta.duration.unwrap_or(::std::time::Duration::new(0, 0)); - *elem.video.borrow_mut() = Some(VideoMedia { - format: format!("{:?}", meta.format), - duration: Duration::seconds(dur.as_secs() as i64) + - Duration::nanoseconds(dur.subsec_nanos() as i64), - width: meta.size.width, - height: meta.size.height, - video: meta.video, - audio: meta.audio, - }); - // Step 6 - elem.change_ready_state(HAVE_METADATA); - self.have_metadata = true; - } - _ => {} - } - } - - #[cfg(any(target_os = "android", target_arch = "arm", target_arch = "aarch64"))] fn check_metadata(&mut self, elem: &HTMLMediaElement) { // Step 6. + // + // TODO: Properly implement once we have figured out the build and + // licensing ffmpeg issues. elem.change_ready_state(HAVE_METADATA); self.have_metadata = true; } diff --git a/components/script/lib.rs b/components/script/lib.rs index 5ca2caa10bf..e0605ebbf67 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -89,8 +89,6 @@ extern crate url; #[macro_use] extern crate util; extern crate uuid; -#[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))] -extern crate video_metadata; extern crate webrender_traits; extern crate websocket; extern crate xml5ever; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 5b9fc065574..e5deef3b7c6 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1941,7 +1941,6 @@ dependencies = [ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "video-metadata 0.1.3 (git+https://github.com/GuillaumeGomez/video-metadata-rs)", "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2479,17 +2478,6 @@ dependencies = [ "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "video-metadata" -version = "0.1.3" -source = "git+https://github.com/GuillaumeGomez/video-metadata-rs#ca921f8529d4ed4b3e093fe30143b3fba08a7bf4" -dependencies = [ - "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "void" version = "1.0.2" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index fdf8e83b369..0a296dda6d8 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1793,7 +1793,6 @@ dependencies = [ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", "uuid 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "video-metadata 0.1.3 (git+https://github.com/GuillaumeGomez/video-metadata-rs)", "webrender_traits 0.3.0 (git+https://github.com/servo/webrender_traits)", "websocket 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", "xml5ever 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2339,17 +2338,6 @@ dependencies = [ "serde 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "video-metadata" -version = "0.1.3" -source = "git+https://github.com/GuillaumeGomez/video-metadata-rs#ca921f8529d4ed4b3e093fe30143b3fba08a7bf4" -dependencies = [ - "gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "void" version = "1.0.2" diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini deleted file mode 100644 index 7280d3b7e4f..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[error.html] - type: testharness - expected: TIMEOUT - [audio.error after successful load] - expected: TIMEOUT - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini index 249d3fa61f6..efd785bce04 100644 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini +++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini @@ -7,6 +7,3 @@ [setting src attribute on autoplay video should trigger loadeddata event] expected: NOTRUN - [setting src attribute on autoplay audio should trigger loadeddata event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini deleted file mode 100644 index 7c16b52bdbe..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[event_loadeddata_noautoplay.html] - type: testharness - expected: TIMEOUT - [setting src attribute on non-autoplay audio should trigger loadeddata event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini deleted file mode 100644 index 90e0b6b2fad..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[event_loadedmetadata.html] - type: testharness - expected: TIMEOUT - [setting src attribute on autoplay audio should trigger loadedmetadata event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini deleted file mode 100644 index 7d4abbe6b77..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[event_loadedmetadata_noautoplay.html] - type: testharness - expected: TIMEOUT - [setting src attribute on non-autoplay audio should trigger loadedmetadata event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini deleted file mode 100644 index ef23353c3bc..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[event_order_loadedmetadata_loadeddata.html] - type: testharness - expected: TIMEOUT - [setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini deleted file mode 100644 index f765e6bca1d..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[readyState_during_loadeddata.html] - type: testharness - expected: TIMEOUT - [audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event] - expected: NOTRUN - diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini deleted file mode 100644 index a3aaca7f389..00000000000 --- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[readyState_during_loadedmetadata.html] - type: testharness - expected: TIMEOUT - [audio.readyState should be >= HAVE_METADATA during loadedmetadata event] - expected: NOTRUN -