From 74423f8544523a0d119ac1b58dd1bc5bb43f0a91 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 12 Jul 2016 18:53:47 +0200 Subject: [PATCH] Travis: added libtheora as third party of ffmpeg/libav --- .travis.yml | 1 + tools/travis/linux.install.deps.sh | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ead6f2da..fb5b4bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ env: - FDKAAC_VERSION=0.1.3 - OGG_VERSION=1.3.2 - VORBIS_VERSION=1.3.4 + - THEORA_VERSION=1.1.1 - VPX_VERSION=1.4.0 matrix: - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true diff --git a/tools/travis/linux.install.deps.sh b/tools/travis/linux.install.deps.sh index 88e327ad..54fe127c 100755 --- a/tools/travis/linux.install.deps.sh +++ b/tools/travis/linux.install.deps.sh @@ -114,6 +114,19 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then make install && \ 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} + # libvpx # https://trac.ffmpeg.org/ticket/4956 echo "" @@ -144,7 +157,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-libfdk_aac\ --enable-libvorbis\ --enable-libtheora\ --enable-libvpx if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then