Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 16:20:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Disable video-metadata build on arm architecture as well

Browse source
This commit is contained in:
Guillaume Gomez 2016-07-27 21:07:15 +02:00
parent 1d53dae960
commit e87c34a9e9
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/Cargo.toml
View file

@ -17,7 +17,7 @@ debugmozjs = ['js/debugmozjs']
[target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies] [target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"} tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}
[target.'cfg(not(target_os = "android"))'.dependencies] [target.'cfg(not(any(target_os = "android", target_arch = "arm")))'.dependencies]
video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"} video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"}
[dependencies] [dependencies]

7
components/script/dom/htmlmediaelement.rs
View file

@ -35,6 +35,7 @@ use string_cache::Atom;
use task_source::TaskSource; use task_source::TaskSource;
use time::{self, Timespec, Duration}; use time::{self, Timespec, Duration};
use url::Url; use url::Url;
#[cfg(not(any(target_os = "android", target_arch = "arm")))]
use video_metadata; use video_metadata;
struct HTMLMediaElementContext { struct HTMLMediaElementContext {
@ -160,7 +161,7 @@ impl HTMLMediaElementContext {
} }
} }
#[cfg(not(target_os = "android"))] #[cfg(not(any(target_os = "android", target_arch = "arm")))]
fn check_metadata(&mut self, elem: &HTMLMediaElement) { fn check_metadata(&mut self, elem: &HTMLMediaElement) {
match video_metadata::get_format_from_slice(&self.data) { match video_metadata::get_format_from_slice(&self.data) {
Ok(meta) => { Ok(meta) => {
@ -182,8 +183,8 @@ impl HTMLMediaElementContext {
} }
} }
#[cfg(target_os = "android")] #[cfg(any(target_os = "android", target_arch = "arm"))]
fn check_metadata(&mut self, _elem: &HTMLMediaElement) { fn check_metadata(&mut self, elem: &HTMLMediaElement) {
// Step 6. // Step 6.
elem.change_ready_state(HAVE_METADATA); elem.change_ready_state(HAVE_METADATA);
self.have_metadata = true; self.have_metadata = true;

2
components/script/lib.rs
View file

@ -88,7 +88,7 @@ extern crate url;
#[macro_use] #[macro_use]
extern crate util; extern crate util;
extern crate uuid; extern crate uuid;
#[cfg(not(target_os = "android"))] #[cfg(not(any(target_os = "android", target_arch = "arm")))]
extern crate video_metadata; extern crate video_metadata;
extern crate webrender_traits; extern crate webrender_traits;
extern crate websocket; extern crate websocket;