script: Disable our dependency in ffmpeg until the media madness is over.

This commit is contained in:
Emilio Cobos Álvarez 2016-08-14 15:45:34 -07:00
parent ec53136863
commit b9f8905b21
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
14 changed files with 8 additions and 115 deletions

View file

@ -27,13 +27,13 @@ Please select your operating system:
#### On OS X (homebrew)
``` sh
brew install automake pkg-config python cmake ffmpeg
brew install automake pkg-config python cmake
pip install virtualenv
```
#### On OS X (MacPorts)
``` sh
sudo port install python27 py27-virtualenv cmake ffmpeg
sudo port install python27 py27-virtualenv cmake
```
#### On OS X 10.11 (El Capitan), you also have to install openssl
@ -53,16 +53,6 @@ export DEP_OPENSSL_INCLUDE=/usr/local/include
./mach build ...
```
If you get this error:
``` sh
"Couldn't find libavformat", do the following:
brew uninstall ffmpeg
brew install ffmpeg --build-from-source
./mach clean
./mach build
```
If you've already partially compiled servo but forgot to do this step, run ./mach clean, link openssl, and recompile.
#### On Debian-based Linuxes
@ -72,8 +62,7 @@ sudo apt-get install git curl freeglut3-dev autoconf \
libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
gperf g++ build-essential cmake virtualenv python-pip \
libssl-dev libbz2-dev libosmesa6-dev libxmu6 libxmu-dev \
libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev \
libavformat-dev
libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev
```
If you are on **Ubuntu 14.04** and encountered errors on installing these dependencies involving `libcheese`, see [#6158](https://github.com/servo/servo/issues/6158) for a workaround.
@ -86,7 +75,7 @@ sudo dnf install curl freeglut-devel libtool gcc-c++ libXi-devel \
freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \
fontconfig-devel cabextract ttmkfdir python python-virtualenv python-pip expat-devel \
rpm-build openssl-devel cmake bzip2-devel libXcursor-devel libXmu-devel mesa-libOSMesa-devel \
dbus-devel ffmpeg-devel
dbus-devel
```
#### On Arch Linux
@ -116,7 +105,7 @@ pacman -Su
pacman -Sy git mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype \
mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates \
mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch \
patchutils make python2-setuptools mingw-w64-x86_64-ffmpeg
patchutils make python2-setuptools
export GCC_URL=http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc
export GCC_EXT=5.4.0-1-any.pkg.tar.xz
pacman -U --noconfirm $GCC_URL-$GCC_EXT $GCC_URL-ada-$GCC_EXT \