From e420c8cf0606c6870502f203f17b597e39b8ab5a Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 27 Mar 2019 18:27:43 -0400 Subject: [PATCH 1/3] Support renamed GStreamer DLLs. Include missing gstgl dependency. --- python/servo/build_commands.py | 20 ++++++++++++++++---- 1 file 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() From dc55409757f4e61fb838d33a836747d6ed836e46 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 27 Mar 2019 23:58:11 -0400 Subject: [PATCH 2/3] More gstreamer 1.15 changes. --- python/servo/build_commands.py | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index bc2239ae5c6..1e99b65d989 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -620,26 +620,26 @@ class MachCommands(CommandBase): status = 1 gst_dlls = [ ["libffi-7.dll", "ffi-7.dll"], - "libgio-2.0-0.dll", - "libglib-2.0-0.dll", - "libgmodule-2.0-0.dll", - "libgobject-2.0-0.dll", - "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", - "libgstrtp-1.0-0.dll", - "libgstsdp-1.0-0.dll", - "libgsttag-1.0-0.dll", - "libgstvideo-1.0-0.dll", - "libgstwebrtc-1.0-0.dll", - "libintl-8.dll", - "liborc-0.4-0.dll", - "libwinpthread-1.dll", - "libz.dll", + ["libgio-2.0-0.dll", "gio-2.0-0.dll"], + ["libglib-2.0-0.dll", "glib-2.0-0.dll"], + ["libgmodule-2.0-0.dll", "gmodule-2.0-0.dll"], + ["libgobject-2.0-0.dll", "gobject-2.0-0.dll"], + ["libgstapp-1.0-0.dll", "gstapp-1.0-0.dll"], + ["libgstaudio-1.0-0.dll", "gstaudio-1.0-0.dll"], + ["libgstbase-1.0-0.dll", "gstbase-1.0-0.dll"], + ["libgstgl-1.0-0.dll", "gstgl-1.0-0.dll"], + ["libgstpbutils-1.0-0.dll", "gstpbutils-1.0-0.dll"], + ["libgstplayer-1.0-0.dll", "gstplayer-1.0-0.dll"], + ["libgstreamer-1.0-0.dll", "gstreamer-1.0-0.dll"], + ["libgstrtp-1.0-0.dll", "gstrtp-1.0-0.dll"], + ["libgstsdp-1.0-0.dll", "gstsdp-1.0-0.dll"], + ["libgsttag-1.0-0.dll", "gsttag-1.0-0.dll"], + ["libgstvideo-1.0-0.dll", "gstvideo-1.0-0.dll"], + ["libgstwebrtc-1.0-0.dll", "gstwebrtc-1.0-0.dll"], + ["libintl-8.dll", "intl-8.dll"], + ["liborc-0.4-0.dll", "orc-0.4-0.dll"], + ["libwinpthread-1.dll", "winpthread-1.dll"], + ["libz.dll", "libz-1.dll"] ] if gst_root: for gst_lib in gst_dlls: @@ -647,7 +647,7 @@ class MachCommands(CommandBase): gst_lib = [gst_lib] for lib in gst_lib: try: - shutil.copy(path.join(gst_root, "bin", gst_lib), + shutil.copy(path.join(gst_root, "bin", lib), servo_exe_dir) break except: From 73aeee19a501bc506962aede08c15c46d40a349d Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 28 Mar 2019 00:42:24 -0400 Subject: [PATCH 3/3] Support 1.15.2 changes. --- python/servo/build_commands.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 1e99b65d989..8033c6859eb 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -611,7 +611,8 @@ class MachCommands(CommandBase): gst_root = "" gst_default_path = path.join("C:\\gstreamer\\1.0", gst_x64) gst_env = "GSTREAMER_1_0_ROOT_" + gst_x64 - if os.path.exists(path.join(gst_default_path, "bin", "libz.dll")): + if os.path.exists(path.join(gst_default_path, "bin", "libffi-7.dll")) or \ + os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")): gst_root = gst_default_path elif os.environ.get(gst_env) is not None: gst_root = os.environ.get(gst_env) @@ -639,7 +640,7 @@ class MachCommands(CommandBase): ["libintl-8.dll", "intl-8.dll"], ["liborc-0.4-0.dll", "orc-0.4-0.dll"], ["libwinpthread-1.dll", "winpthread-1.dll"], - ["libz.dll", "libz-1.dll"] + ["libz.dll", "libz-1.dll", "z-1.dll"] ] if gst_root: for gst_lib in gst_dlls: