diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-03-27 18:27:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 18:27:43 -0400 |
| commit | e420c8cf0606c6870502f203f17b597e39b8ab5a (patch) | |
| tree | d1e8f105287a7b7befc39f495e99064d8cebbb4e /python/servo | |
| parent | cd8b9cab22ba375628b9f47ed0b589397817e145 (diff) | |
| download | servo-e420c8cf0606c6870502f203f17b597e39b8ab5a.tar.gz servo-e420c8cf0606c6870502f203f17b597e39b8ab5a.zip | |
Support renamed GStreamer DLLs. Include missing gstgl dependency.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 3db788a0be5..bc2239ae5c6 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -619,7 +619,7 @@ class MachCommands(CommandBase): print("Could not found GStreamer installation directory.") status = 1 gst_dlls = [ - "libffi-7.dll", + ["libffi-7.dll", "ffi-7.dll"], "libgio-2.0-0.dll", "libglib-2.0-0.dll", "libgmodule-2.0-0.dll", @@ -627,6 +627,7 @@ class MachCommands(CommandBase): "libgstapp-1.0-0.dll", "libgstaudio-1.0-0.dll", "libgstbase-1.0-0.dll", + "libgstgl-1.0-0.dll", "libgstpbutils-1.0-0.dll", "libgstplayer-1.0-0.dll", "libgstreamer-1.0-0.dll", @@ -638,12 +639,23 @@ class MachCommands(CommandBase): "libintl-8.dll", "liborc-0.4-0.dll", "libwinpthread-1.dll", - "libz.dll" + "libz.dll", ] if gst_root: for gst_lib in gst_dlls: - shutil.copy(path.join(gst_root, "bin", gst_lib), - servo_exe_dir) + if isinstance(gst_lib, str): + gst_lib = [gst_lib] + for lib in gst_lib: + try: + shutil.copy(path.join(gst_root, "bin", gst_lib), + servo_exe_dir) + break + except: + pass + else: + print("ERROR: could not find required GStreamer DLL: " + str(gst_lib)) + sys.exit(1) + # copy some MSVC DLLs to servo.exe dir msvc_redist_dir = None vs_platform = os.environ.get("PLATFORM", "").lower() |