Travis: use matrix to build with ffmpeg/libav

Clement Champetier · Clement Champetier · commit 79e8bb9f17bd · 2015-04-02T17:06:43.000+02:00
Fix #138
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
+env:
+  matrix:
+    - DEPENDENCY_MODE=libav
+    - DEPENDENCY_MODE=ffmpeg
+
+language: cpp
+
 os:
   - linux
   - osx
 
-language: cpp
-
 compiler:
   - gcc
   - clang
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -10,9 +10,19 @@ sudo apt-get install -qq python-dev doxygen
 sudo apt-get install -qq freeglut3-dev libxmu-dev
 sudo apt-get install -qq python-nose
 
-# Build FFmpeg 2.2.9
-sudo wget https://www.ffmpeg.org/releases/ffmpeg-2.2.9.tar.bz2
-sudo bunzip2 ffmpeg-2.2.9.tar.bz2
-sudo tar -xvf ffmpeg-2.2.9.tar
-cd ffmpeg-2.2.9
-./configure --disable-yasm --enable-shared --disable-static && make && sudo make install
+if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
+    export FFMPEG_VERSION=2.2.9
+    sudo wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2
+    sudo bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2
+    sudo tar -xvf ffmpeg-${FFMPEG_VERSION}.tar
+    cd ffmpeg-${FFMPEG_VERSION}
+    sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+
+elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
+    export LIBAV_VERSION=11.3
+    sudo wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
+    sudo tar -xvf libav-${LIBAV_VERSION}.tar.gz
+    cd libav-${LIBAV_VERSION}
+    sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+
+fi
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -3,4 +3,10 @@
 brew update
 
 brew install gcc cmake swig
-brew install ffmpeg freeglut doxygen
+brew install freeglut doxygen
+
+if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
+    brew install ffmpeg
+
+elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
+    brew install libav
