Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add condition to not use video-metadata on aarch64 architecture as well

Browse source
This commit is contained in:
Guillaume Gomez 2016-07-28 02:28:02 +02:00
parent e87c34a9e9
commit 19134be74f
3 changed files with 5 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(any(target_os = "android", target_arch = "arm")))'.dependencies] [target.'cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))'.dependencies]
video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"} video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"}
[dependencies] [dependencies]

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

@ -35,7 +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")))] #[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))]
use video_metadata; use video_metadata;
struct HTMLMediaElementContext { struct HTMLMediaElementContext {
@ -161,7 +161,7 @@ impl HTMLMediaElementContext {
} }
} }
#[cfg(not(any(target_os = "android", target_arch = "arm")))] #[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))]
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) => {
@ -183,7 +183,7 @@ impl HTMLMediaElementContext {
} }
} }
#[cfg(any(target_os = "android", target_arch = "arm"))] #[cfg(any(target_os = "android", target_arch = "arm", target_arch = "aarch64"))]
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);

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(any(target_os = "android", target_arch = "arm")))] #[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))]
extern crate video_metadata; extern crate video_metadata;
extern crate webrender_traits; extern crate webrender_traits;
extern crate websocket; extern crate websocket;