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

Update mach bootstrap-gstreamer to use the latest binaries

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-03-27 11:17:18 +01:00
parent 0cb87cca13
commit 10585be25c
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/command_base.py
View file

@ -365,7 +365,7 @@ class CommandBase(object):
return path.join(base_path, build_type, apk_name)
def get_gstreamer_path(self):
return path.join(self.context.topdir, "support", "linux", "gstreamer", "gstreamer")
return path.join(self.context.topdir, "support", "linux", "gstreamer", "gst")
def get_binary_path(self, release, dev, android=False, magicleap=False):
# TODO(autrilla): this function could still use work - it shouldn't
@ -565,7 +565,7 @@ install them, let us know by filing a bug!")
but may still need dynamic search paths. This command sets that up"""
if not android and self.needs_gstreamer_env(None):
gstpath = self.get_gstreamer_path()
os.environ["LD_LIBRARY_PATH"] = path.join(gstpath, "lib", "x86_64-linux-gnu")
os.environ["LD_LIBRARY_PATH"] = path.join(gstpath, "lib")
def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False):
"""Return an extended environment dictionary."""
@ -612,7 +612,7 @@ install them, let us know by filing a bug!")
if self.needs_gstreamer_env(target):
gstpath = self.get_gstreamer_path()
extra_path += [path.join(gstpath, "bin")]
libpath = path.join(gstpath, "lib", "x86_64-linux-gnu")
libpath = path.join(gstpath, "lib")
# we append in the reverse order so that system gstreamer libraries
# do not get precedence
extra_path = [libpath] + extra_path