diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 17019fd4211..d48b16583c0 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -129,7 +129,7 @@ windows_build_env = { }, "arm64": { "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": { "PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe", diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 591a2fc4b20..2749ca7055b 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -749,7 +749,6 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp): "avcodec-58.dll", "avfilter-7.dll", "avformat-58.dll", - "avresample-4.dll", "avutil-56.dll", "bz2.dll", "ffi-7.dll", @@ -775,14 +774,22 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp): "gstwebrtc-1.0-0.dll", "intl-8.dll", "orc-0.4-0.dll", - "postproc-55.dll", "swresample-3.dll", - "swscale-5.dll", - "x264-157.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 += [ "graphene-1.0-0.dll", "gstsctp-1.0-0.dll",