Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc2106bd

Browse files
committed
Travis: update FFmpeg version to 4.*
And update dependencies
1 parent7fcc1b6 commitc2106bd

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

‎.travis.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,28 @@ env:
2525
-DEPENDENCY_LOG_FILE=${TRAVIS_BUILD_DIR}/build-dependencies-log.txt
2626

2727
-YASM_VERSION=1.3.0
28-
-LAME_VERSION=3.99.5
29-
-FAAC_VERSION=1.28
28+
-LAME_VERSION=3.100
29+
#- FAAC_VERSION=1.28
3030
-XVID_VERSION=1.3.3
31-
-FDKAAC_VERSION=0.1.3
31+
#- FDKAAC_VERSION=0.1.3
3232
-OGG_VERSION=1.3.2
33-
-VORBIS_VERSION=1.3.4
34-
-THEORA_VERSION=1.1.1
33+
-VORBIS_VERSION=1.3.6
34+
#- THEORA_VERSION=1.1.1
3535
-VPX_VERSION=1.4.0
3636
matrix:
37-
-DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
38-
-DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
39-
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
40-
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
41-
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
42-
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.6.8 ENABLE_COVERAGE=false
43-
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.7.6 ENABLE_COVERAGE=false
44-
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
37+
# - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.12 ENABLE_COVERAGE=true
38+
# - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.12 ENABLE_COVERAGE=false
39+
# - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=12.3 ENABLE_COVERAGE=true
40+
# - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=12.3 ENABLE_COVERAGE=false
41+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
42+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
43+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
44+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.6.8 ENABLE_COVERAGE=false
45+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.7.6 ENABLE_COVERAGE=false
46+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
47+
# - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=4.0 ENABLE_COVERAGE=false
48+
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=4.1 ENABLE_COVERAGE=false
49+
-DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=4.2 ENABLE_COVERAGE=true
4550

4651
matrix:
4752
exclude:

‎tools/travis/linux.install.deps.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
4545
echo""
4646
echo"Building libmp3lame (${LAME_VERSION})"
4747
DIR=$(mktemp -d libmp3lameXXX)&&cd${DIR}&& \
48-
curl -L -Os http://downloads.sourceforge.net/project/lame/lame/${LAME_VERSION%.*}/lame-${LAME_VERSION}.tar.gz&& \
48+
curl -L -Os http://downloads.sourceforge.net/project/lame/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz&& \
4949
tar xzf lame-${LAME_VERSION}.tar.gz&& \
5050
cd lame-${LAME_VERSION}&& \
5151
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-nasm&& \
@@ -171,7 +171,8 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
171171
export RELEASE_OPTIONS=--disable-debug
172172
export DEBUG_OPTIONS=--enable-debug=3\--disable-optimizations\--disable-sse\--disable-stripping
173173
export LICENSING_OPTIONS=--enable-gpl\--enable-nonfree
174-
export THIRD_PARTIES_OPTIONS=--enable-libmp3lame\--enable-libx264\--enable-libxvid\--enable-avresample\--enable-libvorbis\--enable-libvpx
174+
export THIRD_PARTIES_OPTIONS=--enable-libmp3lame\--enable-libx264\--enable-libxvid\--enable-avresample\--enable-libvpx
175+
export PKG_CONFIG_PATH="${DEPENDENCY_INSTALL_PATH}/lib/pkgconfig"
175176

176177
if [[${DEPENDENCY_NAME}=="ffmpeg" ]];then
177178

@@ -207,6 +208,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
207208
$LICENSING_OPTIONS \
208209
$THIRD_PARTIES_OPTIONS&& \
209210
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
211+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
210212
make install&& \
211213
rm -rf${DIR}
212214

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp