Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't try to load gstreamer on non-x86

Browse source
This commit is contained in:
Manish Goregaokar 2018-09-07 14:42:19 +05:30
parent d3ece2bc49
commit a380c5fd6e
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/bootstrap.py
View file

@ -326,11 +326,13 @@ def windows_msvc(context, force=False):
return 0 return 0
LINUX_SPECIFIC_BOOTSTRAPPERS = { LINUX_SPECIFIC_BOOTSTRAPPERS = {
"salt": salt, "salt": salt,
"gstreamer": gstreamer, "gstreamer": gstreamer,
} }
def bootstrap(context, force=False, specific=None): def bootstrap(context, force=False, specific=None):
'''Dispatches to the right bootstrapping function for the OS.''' '''Dispatches to the right bootstrapping function for the OS.'''

15
python/servo/command_base.py
View file

@ -483,20 +483,19 @@ class CommandBase(object):
def needs_gstreamer_env(self, target): def needs_gstreamer_env(self, target):
if check_gstreamer_lib(): if check_gstreamer_lib():
return False return False
gstpath = self.get_gstreamer_path() if "x86_64" not in (target or host_triple()):
# We don't build gstreamer for non-x86_64 yet
return False
if sys.platform == "linux2": if sys.platform == "linux2":
if "x86_64" not in (target or host_triple()): if path.isdir(self.get_gstreamer_path()):
raise Exception("We don't currently support using local gstreamer builds \
for non-x86_64, please file a bug")
if path.isdir(gstpath):
return True return True
else: else:
raise Exception("Your system's gstreamer libraries are out of date \ raise Exception("Your system's gstreamer libraries are out of date \
(we need at least 1.12). Please run ./mach bootstrap-gstreamer") (we need at least 1.12). Please run ./mach bootstrap-gstreamer")
else: else:
raise Exception("Your system's gstreamer libraries are out of date \ raise Exception("Your system's gstreamer libraries are out of date \
(we need at least 1.12). If you're unable to \ (we need at least 1.12). If you're unable to \
install them, let us know by filing a bug!") install them, let us know by filing a bug!")
return False return False
def set_run_env(self): def set_run_env(self):