diff options
| -rw-r--r-- | etc/taskcluster/decision_task.py | 6 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 3 | ||||
| -rw-r--r-- | python/servo/gstreamer.py | 29 |
3 files changed, 31 insertions, 7 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 4e7ba5cdd4c..8f2b29eb1a9 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -754,16 +754,16 @@ def linux_build_task(name, *, build_env=build_env): def windows_build_task(name, package=True, arch="x86_64", rdp=False): hashes = { "devel": { - "x86_64": "c136cbfb0330041d52fe6ec4e3e468563176333c857f6ed71191ebc37fc9d605", + "x86_64": "bd444f3ff9d828f93ba5db0ef511d648d238fff50c4435ccefc7b3e9b2bea3b9", }, "non-devel": { - "x86_64": "0744a8ef2a4ba393dacb7927d741df871400a85bab5aecf7905f63bf52c405e4", + "x86_64": "f33fff17a558a433b9c4cf7bd9a338a3d0867fa2d5ee1ee33d249b6a55e8a297", }, } prefix = { "x86_64": "msvc", } - version = "1.16.0" + version = "1.16.2" task = ( windows_task(name) .with_max_run_time_minutes(90) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 5a3be66fd09..58654be2dfd 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -909,6 +909,7 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp): # with UWP's restrictions. gst_dlls += [ "graphene-1.0-0.dll", + "libcrypto-1_1-x64.dll", "libgmp-10.dll", "libgnutls-30.dll", "libhogweed-4.dll", @@ -917,10 +918,12 @@ def package_gstreamer_dlls(env, servo_exe_dir, target, uwp): "libogg-0.dll", "libopus-0.dll", "libpng16-16.dll", + "libssl-1_1-x64.dll", "libtasn1-6.dll", "libtheora-0.dll", "libtheoradec-1.dll", "libtheoraenc-1.dll", + "libusrsctp-1.dll", "libvorbis-0.dll", "libvorbisenc-2.dll", "libwinpthread-1.dll", diff --git a/python/servo/gstreamer.py b/python/servo/gstreamer.py index bf75386894b..2e2e66cba32 100644 --- a/python/servo/gstreamer.py +++ b/python/servo/gstreamer.py @@ -18,6 +18,7 @@ GSTREAMER_DYLIBS = [ ("gstcontroller", "gstreamer"), ("gstfft", "gst-plugins-base"), ("gstgl", "gst-plugins-base"), + ("gstnet", "gstreamer"), ("gstpbutils", "gst-plugins-base"), ("gstplayer", "gst-plugins-bad"), ("gstreamer", "gstreamer"), @@ -32,11 +33,13 @@ GSTREAMER_DYLIBS = [ ] NON_UWP_DYLIBS = [ + "gstnet", "gstsctp", ] GSTREAMER_PLUGINS = [ ("gstapp", "gst-plugins-base"), + ("gstaudiobuffersplit", "gst-plugins-bad"), ("gstaudioconvert", "gst-plugins-base"), ("gstaudiofx", "gst-plugins-good"), ("gstaudioparsers", "gst-plugins-good"), @@ -44,6 +47,10 @@ GSTREAMER_PLUGINS = [ ("gstautodetect", "gst-plugins-good"), ("gstcoreelements", "gstreamer"), ("gstdeinterlace", "gst-plugins-good"), + ("gstdtls", "gst-plugins-bad"), + ("gstgio", "gst-plugins-base"), + ("gstid3tag", "gst-plugins-bad"), + ("gstid3demux", "gst-plugins-good"), ("gstinterleave", "gst-plugins-good"), ("gstisomp4", "gst-plugins-good"), ("gstlibav", "gst-libav"), @@ -54,6 +61,7 @@ GSTREAMER_PLUGINS = [ ("gstplayback", "gst-plugins-base"), ("gstproxy", "gst-plugins-bad"), ("gstrtp", "gst-plugins-good"), + ("gstrtpmanager", "gst-plugins-good"), ("gsttheora", "gst-plugins-base"), ("gsttypefindfunctions", "gst-plugins-base"), ("gstvideoconvert", "gst-plugins-base"), @@ -67,21 +75,25 @@ GSTREAMER_PLUGINS = [ ] WINDOWS_PLUGINS = [ - ("gstnice", "gst-plugins-base"), - ("gstwasapi", "gst-plugins-base"), + "gstnice", + "gstwasapi", ] MACOS_PLUGINS = [ ("gstapplemedia", "gst-plugins-bad"), + ("gstosxaudio", "gst-plugins-good"), + ("gstosxvideo", "gst-plugins-good"), ] NON_UWP_PLUGINS = [ + "gstdtls", "gstmatroska", "gstnice", "gstogg", "gstopengl", "gstopus", "gstrtp", + "gstrtpmanager", "gsttheora", "gstvorbis", "gstvpx", @@ -97,12 +109,16 @@ def windows_dlls(uwp): def windows_plugins(uwp): - dlls = [x for x, _ in GSTREAMER_PLUGINS] + [x for x, _ in WINDOWS_PLUGINS] + dlls = [x for x, _ in GSTREAMER_PLUGINS] + WINDOWS_PLUGINS if uwp: dlls = filter(lambda x: x not in NON_UWP_PLUGINS, dlls) return [x + ".dll" for x in dlls] +def macos_libnice(): + return os.path.join('/', 'usr', 'local', 'opt', 'libnice', 'lib') + + def macos_dylibs(): return [ os.path.join( @@ -111,6 +127,9 @@ def macos_dylibs(): "lib", "lib" + name + "-1.0.0.dylib" ) for name, path in GSTREAMER_DYLIBS + ] + [ + os.path.join(macos_libnice(), "libnice.dylib"), + os.path.join(macos_libnice(), "libnice.10.dylib"), ] @@ -122,7 +141,9 @@ def macos_plugins(): "lib", "gstreamer-1.0", "lib" + name + ".so" - ) for name, path in GSTREAMER_PLUGINS + ) for name, path in GSTREAMER_PLUGINS + MACOS_PLUGINS + ] + [ + os.path.join(macos_libnice(), "gstreamer-1.0", "libgstnice.so"), ] |