From 9b28cf89d5586bfb3c72c89ddc1101faf27d2e96 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 1 Aug 2016 11:30:13 +0200 Subject: [PATCH 1/3] Travis: updated how to install dependencies on OS X * Same way to install third party than on Linux. * Homebrew ffmpeg/libav formulas only install the ffmpeg/avconv application (not the shared libraries...). --- tools/travis/osx.install.deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/osx.install.deps.sh b/tools/travis/osx.install.deps.sh index 29047f26..2b0289ea 100755 --- 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 -brew install ${DEPENDENCY_NAME} +./tools/travis/linux.install.deps.sh From 4405c97e22e444cf37ab8798e30bdd99e5f27d02 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 1 Aug 2016 12:06:37 +0200 Subject: [PATCH 2/3] Travis: removed installation of fdk-aac third party Compilation error on OSX. --- tools/travis/linux.install.deps.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/travis/linux.install.deps.sh b/tools/travis/linux.install.deps.sh index aa25ba89..fede33bf 100755 --- a/tools/travis/linux.install.deps.sh +++ b/tools/travis/linux.install.deps.sh @@ -78,17 +78,18 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then # fdk-aac + # Compilation error on OSX # Warning: need automake + libtool - echo "" - echo "Building fdk-aac (${FDKAAC_VERSION})" - DIR=$(mktemp -d fdk-aacXXX) && cd ${DIR} && \ - curl -s https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v${FDKAAC_VERSION} | tar zxf - && \ - cd fdk-aac-${FDKAAC_VERSION} && \ - autoreconf -fiv && \ - ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --enable-shared && \ - make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \ - make install && \ - rm -rf ${DIR} +# echo "" +# echo "Building fdk-aac (${FDKAAC_VERSION})" +# DIR=$(mktemp -d fdk-aacXXX) && cd ${DIR} && \ +# curl -s https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v${FDKAAC_VERSION} | tar zxf - && \ +# cd fdk-aac-${FDKAAC_VERSION} && \ +# autoreconf -fiv && \ +# ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --enable-shared && \ +# make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \ +# make install && \ +# rm -rf ${DIR} # libogg echo "" @@ -158,7 +159,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-libvpx + export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libvorbis\ --enable-libvpx if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then From 32fb2ddbf7803bc87738c7f5cf57c78c09c710fd Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 1 Aug 2016 12:06:57 +0200 Subject: [PATCH 3/3] Travis: removed installation of faac third party Compilation error on OSX. --- tools/travis/linux.install.deps.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/travis/linux.install.deps.sh b/tools/travis/linux.install.deps.sh index fede33bf..6e386b0c 100755 --- a/tools/travis/linux.install.deps.sh +++ b/tools/travis/linux.install.deps.sh @@ -49,20 +49,21 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then # faac + # Compilation error on OSX # http://stackoverflow.com/a/4320377 # http://sourceforge.net/p/faac/bugs/162/#46a0 - echo "" - echo "Building faac (${FAAC_VERSION})" - DIR=$(mktemp -d faacXXX) && cd ${DIR} && \ - 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 && \ - ./bootstrap && \ - ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --with-mp4v2=no && \ - make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \ - make install && \ - rm -rf ${DIR} +# echo "" +# echo "Building faac (${FAAC_VERSION})" +# DIR=$(mktemp -d faacXXX) && cd ${DIR} && \ +# 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 && \ +# ./bootstrap && \ +# ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --with-mp4v2=no && \ +# make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \ +# make install && \ +# rm -rf ${DIR} # xvid echo "" @@ -159,7 +160,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-libvorbis\ --enable-libvpx + export THIRD_PARTIES_OPTIONS=--enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libvorbis\ --enable-libvpx if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then