Skip to content

Commit

Permalink
Auto merge of #19152 - nox:media, r=jdm
Browse files Browse the repository at this point in the history
Include gecko-media in the dependency graph

<!-- 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/19152)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Nov 14, 2017
2 parents 7d13e5b + 23d7783 commit d7b4471
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 6 deletions.
13 changes: 13 additions & 0 deletions .travis.yml
Expand Up @@ -18,6 +18,7 @@ matrix:
- sudo apt-get update -q
- sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime -y
- export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config
- export CC=gcc-5 CXX=g++-5
script:
- ./mach build -d --verbose
- ./mach test-compiletest
Expand All @@ -37,12 +38,24 @@ matrix:
env: CCACHE=/usr/bin/ccache
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:jonathonf/ffmpeg-3'
packages:
- cmake
- dbus-x11
- freeglut3-dev
- gcc-5
- g++-5
- gperf
- libavcodec-dev
- libavformat-dev
- libosmesa6-dev
- libpulse-dev
- libgles2-mesa-dev
- libswscale-dev
- libswresample-dev
- pulseaudio
- python-virtualenv
- xorg-dev
- ccache
Expand Down

0 comments on commit d7b4471

Please sign in to comment.