diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-03-27 10:51:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 10:51:13 -0400 |
| commit | 3e81a5afe938570ee4a0321e2c0269ed582e3adf (patch) | |
| tree | e6a21c4031daf374f949e7f686f4f89aad656a9d | |
| parent | 0cb87cca137ae68d2bfc132750a0dd9d1b499ad0 (diff) | |
| parent | 10585be25c334bd15710d1a6d93391a9acb6d543 (diff) | |
| download | servo-3e81a5afe938570ee4a0321e2c0269ed582e3adf.tar.gz servo-3e81a5afe938570ee4a0321e2c0269ed582e3adf.zip | |
Auto merge of #23111 - ferjm:mach.bootstrap.gstreamer.update, r=jdm
Update `mach bootstrap-gstreamer` to use the latest binaries
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23111)
<!-- Reviewable:end -->
| -rw-r--r-- | python/servo/bootstrap.py | 4 | ||||
| -rw-r--r-- | python/servo/command_base.py | 6 | ||||
| -rw-r--r-- | support/linux/gstreamer/.gitignore | 2 | ||||
| -rw-r--r-- | support/linux/gstreamer/gstreamer.sh | 6 |
4 files changed, 8 insertions, 10 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 diff --git a/support/linux/gstreamer/.gitignore b/support/linux/gstreamer/.gitignore index 3b805050af7..603fa8038b1 100644 --- a/support/linux/gstreamer/.gitignore +++ b/support/linux/gstreamer/.gitignore @@ -1,2 +1,2 @@ -gstreamer/ +gst/ diff --git a/support/linux/gstreamer/gstreamer.sh b/support/linux/gstreamer/gstreamer.sh index 536a1aac3be..cd42b031847 100644 --- a/support/linux/gstreamer/gstreamer.sh +++ b/support/linux/gstreamer/gstreamer.sh @@ -6,7 +6,5 @@ set -o errexit -wget https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz -O gstreamer.tar.gz -tar -zxf gstreamer.tar.gz -rm gstreamer.tar.gz -sed -i "s;prefix=/root/gstreamer;prefix=${PWD}/gstreamer;g" ${PWD}/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc +curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz +sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc |