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

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

4
python/servo/bootstrap.py
View file

@ -46,7 +46,7 @@ def install_trusty_deps(force):
def check_gstreamer_lib(): 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 stdout=PIPE, stderr=PIPE) == 0
@ -94,7 +94,7 @@ def install_salt_dependencies(context, force):
def gstreamer(context, force=False): def gstreamer(context, force=False):
cur = os.curdir cur = os.curdir
gstdir = os.path.join(cur, "support", "linux", "gstreamer") 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) subprocess.check_call(["bash", "gstreamer.sh"], cwd=gstdir)
return True return True
return False return False

6
python/servo/command_base.py
View file

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

2
support/linux/gstreamer/.gitignore vendored
View file

@ -1,2 +1,2 @@
gstreamer/ gst/

6
support/linux/gstreamer/gstreamer.sh
View file

@ -6,7 +6,5 @@
set -o errexit set -o errexit
wget https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz -O gstreamer.tar.gz curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
tar -zxf gstreamer.tar.gz sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
rm gstreamer.tar.gz
sed -i "s;prefix=/root/gstreamer;prefix=${PWD}/gstreamer;g" ${PWD}/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc