Skip to content

Commit

Permalink
Auto merge of #23404 - Manishearth:gst16, r=jdm
Browse files Browse the repository at this point in the history
Update linux desktop to gstreamer 1.16

r? @jdm

<!-- 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/23404)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed May 17, 2019
2 parents fb875f8 + ec15946 commit cdd95ca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -23,7 +23,7 @@ matrix:
- sudo apt-get update -q
- sudo apt-get install clang-3.9 llvm-3.9-dev llvm-3.9-runtime libunwind8-dev -y
- pip install virtualenv
- curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
- curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz | tar xz
- sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
- export PKG_CONFIG_PATH=$PWD/gst/lib/pkgconfig
- export GST_PLUGIN_SYSTEM_PATH=$PWD/gst/lib/gstreamer-1.0
Expand Down
2 changes: 1 addition & 1 deletion support/linux/gstreamer/gstreamer.sh
Expand Up @@ -6,5 +6,5 @@

set -o errexit

curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz | tar xz
sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc

0 comments on commit cdd95ca

Please sign in to comment.