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

Fix Travis CI#308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion.travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,11 +96,12 @@ before_script:
# install coverage tools
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi


script:
# install avtranscoder dependencies
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi

script:
# build
- ./tools/travis/build.sh

Expand Down
1 change: 1 addition & 0 deletionssrc/AvTranscoder/avTranscoder.i
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
%include "std_vector.i"
%include "std_pair.i"
%include "std_map.i"
%include "stdint.i"

%include "AvTranscoder/swig/avException.i"
%include "AvTranscoder/swig/avExport.i"
Expand Down
14 changes: 13 additions & 1 deletiontools/travis/linux.install.deps.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
export LD_LIBRARY_PATH=${DEPENDENCY_INSTALL_PATH}/lib:${DEPENDENCY_INSTALL_PATH}/lib64
export PKG_CONFIG_PATH=${DEPENDENCY_INSTALL_PATH}/lib/pkgconfig:${DEPENDENCY_INSTALL_PATH}/lib64/pkgconfig
export PATH=$PATH:${DEPENDENCY_INSTALL_PATH}/bin
echo "Build log file: ${DEPENDENCY_LOG_FILE}"

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

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

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

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

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

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

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

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

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp