diff options
| author | bors-servo <servo-ops@mozilla.com> | 2020-11-13 11:56:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 11:56:22 -0500 |
| commit | 917fd001fe4bdf9970078b8607c8bbaf6146a431 (patch) | |
| tree | aa1dbad1607b4af7991f5444c42fbedcf779c24a /python | |
| parent | 553ff20468862fde74cc307ebc733e86c9bfbe80 (diff) | |
| parent | 19b9314b485d03fe68f1fa0fc060a4e196a7afc1 (diff) | |
| download | servo-917fd001fe4bdf9970078b8607c8bbaf6146a431.tar.gz servo-917fd001fe4bdf9970078b8607c8bbaf6146a431.zip | |
Auto merge of #27748 - servo:jdm-patch-47, r=jdm
Fix mac packaging with recent gstreamer.
Fixes #27654.
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/gstreamer.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/python/servo/gstreamer.py b/python/servo/gstreamer.py index 2e2e66cba32..5a810711770 100644 --- a/python/servo/gstreamer.py +++ b/python/servo/gstreamer.py @@ -80,7 +80,9 @@ WINDOWS_PLUGINS = [ ] MACOS_PLUGINS = [ - ("gstapplemedia", "gst-plugins-bad"), + # Temporarily disabled until CI is using Mojave. + # https://github.com/servo/saltfs/issues/1011 + # ("gstapplemedia", "gst-plugins-bad"), ("gstosxaudio", "gst-plugins-good"), ("gstosxvideo", "gst-plugins-good"), ] @@ -140,10 +142,10 @@ def macos_plugins(): path, "lib", "gstreamer-1.0", - "lib" + name + ".so" + "lib" + name + ".dylib" ) for name, path in GSTREAMER_PLUGINS + MACOS_PLUGINS ] + [ - os.path.join(macos_libnice(), "gstreamer-1.0", "libgstnice.so"), + os.path.join(macos_libnice(), "gstreamer-1.0", "libgstnice.dylib"), ] |