diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/bootstrap.py | 4 | ||||
| -rw-r--r-- | python/servo/command_base.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 6456f1a0752..a3367f2e225 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -46,7 +46,7 @@ def install_trusty_deps(force): def check_gstreamer_lib(): - return subprocess.call(["pkg-config", "--atleast-version=1.12", "gstreamer-1.0"], + return subprocess.call(["pkg-config", "--atleast-version=1.14", "gstreamer-1.0"], stdout=PIPE, stderr=PIPE) == 0 @@ -94,7 +94,7 @@ def install_salt_dependencies(context, force): def gstreamer(context, force=False): cur = os.curdir gstdir = os.path.join(cur, "support", "linux", "gstreamer") - if not os.path.isdir(os.path.join(gstdir, "gstreamer", "lib")): + if not os.path.isdir(os.path.join(gstdir, "gst", "lib")): subprocess.check_call(["bash", "gstreamer.sh"], cwd=gstdir) return True return False diff --git a/python/servo/command_base.py b/python/servo/command_base.py index a8bba6c6d59..2d159df3773 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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 |