Skip to content

Commit c6719a6

Browse files
authored
Merge pull request #266 from cchampet/travis_addLibTheora
Travis: added libtheora as third party of ffmpeg/libav
2 parents 7813df1 + 2a17a4c commit c6719a6

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ env:
3131
- FDKAAC_VERSION=0.1.3
3232
- OGG_VERSION=1.3.2
3333
- VORBIS_VERSION=1.3.4
34+
- THEORA_VERSION=1.1.1
3435
- VPX_VERSION=1.4.0
3536
matrix:
3637
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true

tools/travis/linux.install.deps.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,19 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
114114
make install && \
115115
rm -rf ${DIR}
116116

117+
# 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}
129+
117130
# libvpx
118131
# https://trac.ffmpeg.org/ticket/4956
119132
echo ""
@@ -144,7 +157,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
144157
export RELEASE_OPTIONS=--disable-debug
145158
export DEBUG_OPTIONS=--enable-debug=3\ --disable-optimizations\ --disable-sse\ --disable-stripping
146159
export LICENSING_OPTIONS=--enable-gpl\ --enable-nonfree
147-
export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libvpx
160+
export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libtheora\ --enable-libvpx
148161

149162
if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
150163

0 commit comments

Comments
 (0)