Skip to content

Commit 4405c97

Browse files
author
Clement Champetier
committed
Travis: removed installation of fdk-aac third party
Compilation error on OSX.
1 parent 9b28cf8 commit 4405c97

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

tools/travis/linux.install.deps.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,18 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
7878

7979

8080
# fdk-aac
81+
# Compilation error on OSX
8182
# Warning: need automake + libtool
82-
echo ""
83-
echo "Building fdk-aac (${FDKAAC_VERSION})"
84-
DIR=$(mktemp -d fdk-aacXXX) && cd ${DIR} && \
85-
curl -s https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v${FDKAAC_VERSION} | tar zxf - && \
86-
cd fdk-aac-${FDKAAC_VERSION} && \
87-
autoreconf -fiv && \
88-
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --enable-shared && \
89-
make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
90-
make install && \
91-
rm -rf ${DIR}
83+
# echo ""
84+
# echo "Building fdk-aac (${FDKAAC_VERSION})"
85+
# DIR=$(mktemp -d fdk-aacXXX) && cd ${DIR} && \
86+
# curl -s https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v${FDKAAC_VERSION} | tar zxf - && \
87+
# cd fdk-aac-${FDKAAC_VERSION} && \
88+
# autoreconf -fiv && \
89+
# ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --enable-shared && \
90+
# make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
91+
# make install && \
92+
# rm -rf ${DIR}
9293

9394
# libogg
9495
echo ""
@@ -158,7 +159,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
158159
export RELEASE_OPTIONS=--disable-debug
159160
export DEBUG_OPTIONS=--enable-debug=3\ --disable-optimizations\ --disable-sse\ --disable-stripping
160161
export LICENSING_OPTIONS=--enable-gpl\ --enable-nonfree
161-
export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libvpx
162+
export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libvorbis\ --enable-libvpx
162163

163164
if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
164165

0 commit comments

Comments
 (0)