Skip to content
Permalink
Browse files

Update mach bootstrap-gstreamer to use the latest binaries

  • Loading branch information...
ferjm committed Mar 27, 2019
1 parent 0cb87cc commit 10585be25c334bd15710d1a6d93391a9acb6d543
@@ -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
@@ -365,7 +365,7 @@ def get_apk_path(self, release):
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 @@ def set_run_env(self, android=False):
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 @@ def package_dir(package):
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
@@ -1,2 +1,2 @@
gstreamer/
gst/

@@ -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

0 comments on commit 10585be

Please sign in to comment.
You can’t perform that action at this time.