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

Commit096bbe7

Browse files
Merge pull request#308 from valnoel/fix_travis_ci_build
Fix Travis CI
2 parents4a61763 +35cde24 commit096bbe7

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ before_script:
9696
# install coverage tools
9797
-if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi
9898

99+
100+
script:
99101
# install avtranscoder dependencies
100102
-if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
101103
-if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi
102104

103-
script:
104105
# build
105106
-./tools/travis/build.sh
106107

‎src/AvTranscoder/avTranscoder.i

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
%include"std_vector.i"
77
%include"std_pair.i"
88
%include"std_map.i"
9+
%include"stdint.i"
910

1011
%include"AvTranscoder/swig/avException.i"
1112
%include"AvTranscoder/swig/avExport.i"

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
1212
export LD_LIBRARY_PATH=${DEPENDENCY_INSTALL_PATH}/lib:${DEPENDENCY_INSTALL_PATH}/lib64
1313
export PKG_CONFIG_PATH=${DEPENDENCY_INSTALL_PATH}/lib/pkgconfig:${DEPENDENCY_INSTALL_PATH}/lib64/pkgconfig
1414
export PATH=$PATH:${DEPENDENCY_INSTALL_PATH}/bin
15+
echo"Build log file:${DEPENDENCY_LOG_FILE}"
1516

1617
# yasm
1718
echo"Building YASM (${YASM_VERSION})"
@@ -21,17 +22,22 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
2122
cd yasm-${YASM_VERSION}&& \
2223
./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin"&& \
2324
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
25+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
2426
make install&& \
2527
rm -rf${DIR}
2628

2729
# x264
2830
echo""
2931
echo"Building x264 (last version)"
32+
# or before commit https://code.videolan.org/videolan/x264/commit/e9a5903edf8ca59ef20e6f4894c196f135af735e
33+
# => see https://trac.ffmpeg.org/ticket/6932
3034
DIR=$(mktemp -d x264XXX)&&cd${DIR}&& \
31-
git clone--depth 1 git://git.videolan.org/x264&& \
35+
git clonehttps://code.videolan.org/videolan/x264.git&& \
3236
cd x264&& \
37+
if [[${DEPENDENCY_VERSION}== 2.*.* ]];then git checkout ba24899b0bf23345921da022f7a51e0c57dbe73d;fi
3338
./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --disable-asm&& \
3439
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
40+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
3541
make install&& \
3642
rm -rf${DIR}
3743

@@ -44,6 +50,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
4450
cd lame-${LAME_VERSION}&& \
4551
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-nasm&& \
4652
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
53+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
4754
make install&& \
4855
rm -rf${DIR}
4956

@@ -74,6 +81,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
7481
cd xvidcore/build/generic&& \
7582
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin"&& \
7683
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
84+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
7785
make install&& \
7886
rm -rf${DIR}
7987

@@ -101,6 +109,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
101109
cd libogg-${OGG_VERSION}&& \
102110
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --disable-shared --with-pic&& \
103111
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
112+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
104113
make install&& \
105114
rm -rf${DIR}
106115

@@ -113,6 +122,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
113122
cd libvorbis-${VORBIS_VERSION}&& \
114123
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --with-ogg="${DEPENDENCY_INSTALL_PATH}" --disable-shared --with-pic&& \
115124
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
125+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
116126
make install&& \
117127
rm -rf${DIR}
118128

@@ -140,6 +150,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
140150
git checkout v${VPX_VERSION}&& \
141151
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --disable-examples --enable-pic&& \
142152
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
153+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
143154
make install&& \
144155
rm -rf${DIR}
145156

@@ -177,6 +188,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
177188
$LICENSING_OPTIONS \
178189
$THIRD_PARTIES_OPTIONS --enable-postproc&& \
179190
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
191+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
180192
make install&& \
181193
rm -rf${DIR}
182194

0 commit comments

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