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

Fix gstreamer packaging on mac.

Browse source
This commit is contained in:
Josh Matthews 2020-11-13 11:55:56 -05:00
parent 5488790be6
commit 19b9314b48
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
etc/taskcluster/decision_task.py
View file

@ -494,7 +494,6 @@ def macos_release_build_with_debug_assertions(priority=None):
"./etc/ci/lockfile_changed.sh", "./etc/ci/lockfile_changed.sh",
"tar -czf target.tar.gz" + "tar -czf target.tar.gz" +
" target/release/servo" + " target/release/servo" +
" target/release/*.so" +
" target/release/*.dylib" + " target/release/*.dylib" +
" resources", " resources",
])) ]))

8
python/servo/gstreamer.py
View file

@ -80,7 +80,9 @@ WINDOWS_PLUGINS = [
] ]
MACOS_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"), ("gstosxaudio", "gst-plugins-good"),
("gstosxvideo", "gst-plugins-good"), ("gstosxvideo", "gst-plugins-good"),
] ]
@ -140,10 +142,10 @@ def macos_plugins():
path, path,
"lib", "lib",
"gstreamer-1.0", "gstreamer-1.0",
"lib" + name + ".so" "lib" + name + ".dylib"
) for name, path in GSTREAMER_PLUGINS + MACOS_PLUGINS ) 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"),
] ]