Skip to content

Commit 68b8390

Browse files
author
Clement Champetier
committed
Travis: removed build of libtheora
Compilation error with clang.
1 parent d47e55b commit 68b8390

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

tools/travis/linux.install.deps.sh

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,18 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
115115
rm -rf ${DIR}
116116

117117
# libtheora
118-
echo ""
119-
echo "Building libtheora (${THEORA_VERSION})"
120-
DIR=$(mktemp -d libtheoraXXX) && cd ${DIR} && \
121-
curl -O http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
122-
tar xvjf libtheora-${THEORA_VERSION}.tar.bz2 && \
123-
cd libtheora-${THEORA_VERSION} && \
124-
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" && \
125-
make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
126-
make install && \
127-
make check && \
128-
rm -rf ${DIR}
118+
# Compilation error with clang
119+
# echo ""
120+
# echo "Building libtheora (${THEORA_VERSION})"
121+
# DIR=$(mktemp -d libtheoraXXX) && cd ${DIR} && \
122+
# curl -O http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
123+
# tar xvjf libtheora-${THEORA_VERSION}.tar.bz2 && \
124+
# cd libtheora-${THEORA_VERSION} && \
125+
# ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" && \
126+
# make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
127+
# make install && \
128+
# make check && \
129+
# rm -rf ${DIR}
129130

130131
# libvpx
131132
# https://trac.ffmpeg.org/ticket/4956
@@ -141,7 +142,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
141142
rm -rf ${DIR}
142143

143144
# libopus
144-
# Compile error on OSX
145+
# Compilation error on OSX
145146
# echo ""
146147
# echo "Building libopus (last version)"
147148
# DIR=$(mktemp -d libopusXXX) && cd ${DIR} && \
@@ -157,7 +158,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
157158
export RELEASE_OPTIONS=--disable-debug
158159
export DEBUG_OPTIONS=--enable-debug=3\ --disable-optimizations\ --disable-sse\ --disable-stripping
159160
export LICENSING_OPTIONS=--enable-gpl\ --enable-nonfree
160-
export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libtheora\ --enable-libvpx
161+
export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libvpx
161162

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

0 commit comments

Comments
 (0)