Specifying v1.0.0-errata1 as the version of libaom

ffmpeg_4.4.2
Javernaut 5 years ago
parent 59a3a5306a
commit 7d9abc9be0
  1. 2
      .travis.yml
  2. 2
      scripts/libaom/build.sh
  3. 17
      scripts/libaom/download.sh

@ -2,6 +2,8 @@ language: java
jdk: openjdk8
dist: xenial
install:
- echo "pkg-config:"
- which pkg-config
# Installing Android SDK
- curl https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip --output $HOME/android-sdk.zip
- unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk

@ -1,4 +1,4 @@
# libaom doesn't support building being in its root directory
# libaom doesn't support building while being in its root directory
CMAKE_BUILD_DIR=aom_build_${ANDROID_ABI}
rm -rf ${CMAKE_BUILD_DIR}
mkdir ${CMAKE_BUILD_DIR}

@ -2,16 +2,17 @@
# Exports SOURCES_DIR_libaom - path where actual sources are stored
# TODO Consider using a specific git tag (like v1.0.0-errata1) for reproducible builds
AOM_VERSION=v1.0.0-errata1
echo "Using libaom $AOM_VERSION"
AOM_SOURCES=libaom-${AOM_VERSION}
echo "Using aom master branch"
AOM_SOURCES=aom
if [[ ! -d "$AOM_SOURCES" ]]; then
git clone https://aomedia.googlesource.com/aom
fi
TARGET_FILE_NAME=${AOM_VERSION}.tar.gz
cd aom
git pull origin master
cd ..
curl https://aomedia.googlesource.com/aom/+archive/${TARGET_FILE_NAME} --output ${TARGET_FILE_NAME}
mkdir $AOM_SOURCES
tar xf ${TARGET_FILE_NAME} -C $AOM_SOURCES
rm ${TARGET_FILE_NAME}
fi
export SOURCES_DIR_libaom=$(pwd)/${AOM_SOURCES}

Loading…
Cancel
Save