diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-07-26 13:25:18 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-07-27 09:55:43 -0400 |
| commit | 9336931377ecf348f5f8c30a5e7c4016a04214f9 (patch) | |
| tree | 08d9edb062e88172442e3718ff2d3aa2cc5a60d3 /python/servo/build_commands.py | |
| parent | 817a7fe2af10b1c5d54415d7aa8404e12f40384f (diff) | |
| download | servo-9336931377ecf348f5f8c30a5e7c4016a04214f9.tar.gz servo-9336931377ecf348f5f8c30a5e7c4016a04214f9.zip | |
Fix CI builds.
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 17 |
1 files changed, 12 insertions, 5 deletions
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", |