Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24004 - servo:win-gstreamer, r=ferjm

Browse source 
Enable GStreamer on Windows.

I have verified that desktop and emulator UWP builds work with this set of DLLs.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because no tests for UWP

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24004)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-08-27 10:11:37 -04:00 • committed by GitHub
commit 9fe3c4fc0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1331 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/servo/Cargo.toml
View file

@ -85,10 +85,10 @@ webxr-api = {git = "https://github.com/servo/webxr"}
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = {git = "https://github.com/servo/gaol"}
[target.'cfg(all(not(target_os = "windows"), any(target_os = "android", target_arch = "x86_64")))'.dependencies.servo-media-gstreamer]
[target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies.servo-media-gstreamer]
git = "https://github.com/servo/media"
[target.'cfg(any(target_os = "windows", not(any(target_os = "android", target_arch = "x86_64"))))'.dependencies.servo-media-dummy]
[target.'cfg(not(any(target_os = "android", target_arch = "x86_64", target_os = "windows")))'.dependencies.servo-media-dummy]
git = "https://github.com/servo/media"
[target.'cfg(target_os = "windows")'.dependencies]

10
components/servo/lib.rs
View file

@ -125,10 +125,7 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
pub use servo_config as config;
pub use servo_url as url;
#[cfg(all(
not(target_os = "windows"),
any(target_os = "android", target_arch = "x86_64",)
))]
#[cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows",))]
mod media_platform {
use super::ServoMedia;
use servo_media_gstreamer::GStreamerBackend;
@ -206,10 +203,7 @@ mod media_platform {
}
}
#[cfg(not(all(
not(target_os = "windows"),
any(target_os = "android", target_arch = "x86_64",)
)))]
#[cfg(not(any(target_os = "android", target_arch = "x86_64", target_os = "windows",)))]
mod media_platform {
use super::ServoMedia;
pub fn init() {