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

Auto merge of #24392 - ferjm:uwp.no.system.gst, r=Manishearth

Browse source 
Allow building and cleaning for UWP without system GStreamer

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- 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/24392)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-10-08 14:13:37 -04:00 • committed by GitHub
commit 9c3e4a74db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/command_base.py
View file

@ -558,7 +558,9 @@ class CommandBase(object):
return self.get_executable(destination_folder) return self.get_executable(destination_folder)
def needs_gstreamer_env(self, target, env): def needs_gstreamer_env(self, target, env, uwp=False):
if uwp:
return False
try: try:
if check_gstreamer_lib(): if check_gstreamer_lib():
return False return False
@ -663,7 +665,7 @@ install them, let us know by filing a bug!")
# Always build harfbuzz from source # Always build harfbuzz from source
env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true"
if self.needs_gstreamer_env(target or host_triple(), env): if is_build and self.needs_gstreamer_env(target or host_triple(), env, uwp):
gstpath = gstreamer_root(target or host_triple(), env, self.get_top_dir()) gstpath = gstreamer_root(target or host_triple(), env, self.get_top_dir())
extra_path += [path.join(gstpath, "bin")] extra_path += [path.join(gstpath, "bin")]
libpath = path.join(gstpath, "lib") libpath = path.join(gstpath, "lib")