Travis: build ffmpeg/libav dependencies the same way in both linux and osx

cchampet · cchampet · commit 72d73a5ffe7b · 2015-12-10T10:41:36.000+01:00
* Because we cannot specify a dependency version when using homebrew.
* It is easier to maintain.
* Note: removed 'lsb_release -a' since this command works only on linux.
It prints platform info, so it is not a big deal to remove it.
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -3,8 +3,6 @@
 # Print commands and their arguments as they are executed.
 set -x
 
-lsb_release -a
-
 if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
 
     if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -16,13 +16,4 @@ pip install nose
 brew install freeglut
 
 # Main dependency
-if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
-    brew install ffmpeg
-elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then
-
-    wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz
-    tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz
-    cd libav-${DEPENDENCY_VERSION}
-    ./configure --disable-yasm --enable-shared --disable-static && make -k && make install
-
-fi
+./travis.linux.install.deps.sh
