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

Fix CI builds.

Browse source
This commit is contained in:
Josh Matthews 2019-07-26 13:25:18 -04:00
parent 817a7fe2af
commit 9336931377
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/taskcluster/decision_task.py
View file

@ -129,7 +129,7 @@ windows_build_env = {
}, },
"arm64": { "arm64": {
"PKG_CONFIG_ALLOW_CROSS": "1", "PKG_CONFIG_ALLOW_CROSS": "1",
# No GStreamer support for arm64 windows yet. "GSTREAMER_1_0_ROOT_ARM64": "%HOMEDRIVE%%HOMEPATH%\\repo\\.servo\\msvc-dependencies\\gstreamer-uwp\\1.16.0.3\\arm64\\",
}, },
"all": { "all": {
"PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe", "PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe",

17
python/servo/build_commands.py
View file

@ -749,7 +749,6 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
"avcodec-58.dll", "avcodec-58.dll",
"avfilter-7.dll", "avfilter-7.dll",
"avformat-58.dll", "avformat-58.dll",
"avresample-4.dll",
"avutil-56.dll", "avutil-56.dll",
"bz2.dll", "bz2.dll",
"ffi-7.dll", "ffi-7.dll",
@ -775,14 +774,22 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp):
"gstwebrtc-1.0-0.dll", "gstwebrtc-1.0-0.dll",
"intl-8.dll", "intl-8.dll",
"orc-0.4-0.dll", "orc-0.4-0.dll",
"postproc-55.dll",
"swresample-3.dll", "swresample-3.dll",
"swscale-5.dll",
"x264-157.dll",
"z-1.dll", "z-1.dll",
] ]
if not uwp: if uwp:
# These come from a more recent version of ffmpeg and
# aren't present in the official GStreamer 1.16 release.
gst_dlls += [
"avresample-4.dll",
"postproc-55.dll",
"swscale-5.dll",
"x264-157.dll",
]
else:
# These are built with MinGW and are not yet compatible
# with UWP's restrictions.
gst_dlls += [ gst_dlls += [
"graphene-1.0-0.dll", "graphene-1.0-0.dll",
"gstsctp-1.0-0.dll", "gstsctp-1.0-0.dll",