Merge pull request #308 from valnoel/fix_travis_ci_build

MarcAntoine-Arnaud · web-flow · commit 096bbe7ddeb9 · 2019-11-28T09:26:02.000+01:00
Fix Travis CI
diff --git a/.travis.yml b/.travis.yml
@@ -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
 
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -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"
diff --git a/tools/travis/linux.install.deps.sh b/tools/travis/linux.install.deps.sh
@@ -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})"
@@ -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 clone https://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}
 
@@ -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}
 
@@ -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}
 
@@ -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}
 
@@ -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}
 
@@ -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}
 
@@ -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}
 
