Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-29 19:43:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support renamed GStreamer DLLs. Include missing gstgl dependency.

Browse source
This commit is contained in:
Josh Matthews 2019-03-27 18:27:43 -04:00 • committed by GitHub
parent cd8b9cab22
commit e420c8cf06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
python/servo/build_commands.py
View file

@ -619,7 +619,7 @@ class MachCommands(CommandBase):
print("Could not found GStreamer installation directory.") print("Could not found GStreamer installation directory.")
status = 1 status = 1
gst_dlls = [ gst_dlls = [
"libffi-7.dll", ["libffi-7.dll", "ffi-7.dll"],
"libgio-2.0-0.dll", "libgio-2.0-0.dll",
"libglib-2.0-0.dll", "libglib-2.0-0.dll",
"libgmodule-2.0-0.dll", "libgmodule-2.0-0.dll",
@ -627,6 +627,7 @@ class MachCommands(CommandBase):
"libgstapp-1.0-0.dll", "libgstapp-1.0-0.dll",
"libgstaudio-1.0-0.dll", "libgstaudio-1.0-0.dll",
"libgstbase-1.0-0.dll", "libgstbase-1.0-0.dll",
"libgstgl-1.0-0.dll",
"libgstpbutils-1.0-0.dll", "libgstpbutils-1.0-0.dll",
"libgstplayer-1.0-0.dll", "libgstplayer-1.0-0.dll",
"libgstreamer-1.0-0.dll", "libgstreamer-1.0-0.dll",
@ -638,12 +639,23 @@ class MachCommands(CommandBase):
"libintl-8.dll", "libintl-8.dll",
"liborc-0.4-0.dll", "liborc-0.4-0.dll",
"libwinpthread-1.dll", "libwinpthread-1.dll",
"libz.dll" "libz.dll",
] ]
if gst_root: if gst_root:
for gst_lib in gst_dlls: for gst_lib in gst_dlls:
if isinstance(gst_lib, str):
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", gst_lib),
servo_exe_dir) 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 # copy some MSVC DLLs to servo.exe dir
msvc_redist_dir = None msvc_redist_dir = None
vs_platform = os.environ.get("PLATFORM", "").lower() vs_platform = os.environ.get("PLATFORM", "").lower()