aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-11-25 12:42:00 -0500
committerGitHub <noreply@github.com>2019-11-25 12:42:00 -0500
commit49841b8ce9d00445295ef841f2ebede713e259af (patch)
treefcc5f84936c009912f47f01cfb14ff11a4f5879c /python/servo
parentf6a20a14b8e4f2412ac411e1a5a50c2952ee6b1b (diff)
parent0ee6695e4eb80612699579e74d577e1989ee0f76 (diff)
downloadservo-49841b8ce9d00445295ef841f2ebede713e259af.tar.gz
servo-49841b8ce9d00445295ef841f2ebede713e259af.zip
Auto merge of #24754 - asajeffrey:gstplugin, r=ferjm
Add a gstreamer servosrc plugin <!-- Please describe your changes on the following line: --> A first draft of a gstreamer plugin. Lots of stuff to fix, most importantly that it should write to GL memory, not do readback. But it's a start! --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because it's a new platform <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/bootstrap.py2
-rw-r--r--python/servo/command_base.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py
index f65284073e9..e191798cac5 100644
--- a/python/servo/bootstrap.py
+++ b/python/servo/bootstrap.py
@@ -49,7 +49,7 @@ def install_trusty_deps(force):
def check_gstreamer_lib():
- return subprocess.call(["pkg-config", "--atleast-version=1.14", "gstreamer-1.0"],
+ return subprocess.call(["pkg-config", "--atleast-version=1.16", "gstreamer-1.0"],
stdout=PIPE, stderr=PIPE) == 0
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 5a8818333a9..e6b3ec7908b 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -583,10 +583,10 @@ class CommandBase(object):
return True
else:
raise Exception("Your system's gstreamer libraries are out of date \
-(we need at least 1.12). Please run ./mach bootstrap-gstreamer")
+(we need at least 1.16). Please run ./mach bootstrap-gstreamer")
else:
raise Exception("Your system's gstreamer libraries are out of date \
-(we need at least 1.12). If you're unable to \
+(we need at least 1.16). If you're unable to \
install them, let us know by filing a bug!")
return False
@@ -679,7 +679,7 @@ install them, let us know by filing a bug!")
# we append in the reverse order so that system gstreamer libraries
# do not get precedence
extra_path = [libpath] + extra_path
- extra_lib = [libpath] + extra_path
+ extra_lib = [libpath] + extra_lib
append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH")
if sys.platform == "linux2":