Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into dev_transcoderUseComplexFilterToMapAudio

Clement Champetier · Clement Champetier · commit 2e612591caa1 · 2016-07-21T16:46:38.000+02:00
diff --git a/tools/travis/linux.install.deps.sh b/tools/travis/linux.install.deps.sh
@@ -57,7 +57,7 @@ if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
                   curl -L -Os http://downloads.sourceforge.net/faac/faac-${FAAC_VERSION}.tar.gz  && \
                   tar xzf faac-${FAAC_VERSION}.tar.gz && \
                   cd faac-${FAAC_VERSION} && \
-                  #sed -i '126d' common/mp4v2/mpeg4ip.h && \
+                  sed -i '126d' common/mp4v2/mpeg4ip.h && \
                   ./bootstrap && \
                   ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --with-mp4v2=no && \
                   make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
@@ -115,17 +115,18 @@ if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
                   rm -rf ${DIR}
 
     # libtheora
-    echo ""
-    echo "Building libtheora (${THEORA_VERSION})"
-    DIR=$(mktemp -d libtheoraXXX) && cd ${DIR} && \
-                  curl -O http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
-                  tar xvjf libtheora-${THEORA_VERSION}.tar.bz2 && \
-                  cd libtheora-${THEORA_VERSION} && \
-                  ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" && \
-                  make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
-                  make install && \
-                  make check && \
-                  rm -rf ${DIR}
+    # Compilation error with clang
+#    echo ""
+#    echo "Building libtheora (${THEORA_VERSION})"
+#    DIR=$(mktemp -d libtheoraXXX) && cd ${DIR} && \
+#                  curl -O http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
+#                  tar xvjf libtheora-${THEORA_VERSION}.tar.bz2 && \
+#                  cd libtheora-${THEORA_VERSION} && \
+#                  ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" && \
+#                  make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
+#                  make install && \
+#                  make check && \
+#                  rm -rf ${DIR}
 
     # libvpx
     # https://trac.ffmpeg.org/ticket/4956
@@ -141,7 +142,7 @@ if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
                   rm -rf ${DIR}
 
     # libopus
-    # Compile error on OSX
+    # Compilation error on OSX
 #    echo ""
 #    echo "Building libopus (last version)"
 #    DIR=$(mktemp -d libopusXXX) && cd ${DIR} && \
@@ -157,7 +158,7 @@ if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
     export RELEASE_OPTIONS=--disable-debug
     export DEBUG_OPTIONS=--enable-debug=3\ --disable-optimizations\ --disable-sse\ --disable-stripping
     export LICENSING_OPTIONS=--enable-gpl\ --enable-nonfree
-    export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libtheora\ --enable-libvpx
+    export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libvpx
 
     if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
 
diff --git a/tools/travis/osx.install.deps.sh b/tools/travis/osx.install.deps.sh
@@ -16,4 +16,4 @@ pip install nose
 brew install freeglut
 
 # Main dependency
-./tools/travis/linux.install.deps.sh
+brew install ${DEPENDENCY_NAME}
