From 2a2d8af8ac9a7de7f06535d347ea230d28284904 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Tue, 10 Dec 2019 20:24:16 +0200 Subject: [PATCH] Specifying the version of libaom as v1.0.0-2780-ge1ec46ae2 --- .travis.yml | 2 -- scripts/libaom/download.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3701caf..723ba92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ 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 diff --git a/scripts/libaom/download.sh b/scripts/libaom/download.sh index e76e7c2..deab913 100755 --- a/scripts/libaom/download.sh +++ b/scripts/libaom/download.sh @@ -2,14 +2,18 @@ # Exports SOURCES_DIR_libaom - path where actual sources are stored -AOM_VERSION=v1.0.0-errata1 +# This 2 variables have to be changed at once. +# The first one is produced by 'git describe' command while being in the commit represented by the second one. +AOM_VERSION=v1.0.0-2780-ge1ec46ae2 +AOM_HASH=e1ec46ae24bb406057c3c256e69cd359b342a8d3 + echo "Using libaom $AOM_VERSION" AOM_SOURCES=libaom-${AOM_VERSION} if [[ ! -d "$AOM_SOURCES" ]]; then TARGET_FILE_NAME=${AOM_VERSION}.tar.gz - curl https://aomedia.googlesource.com/aom/+archive/${TARGET_FILE_NAME} --output ${TARGET_FILE_NAME} + curl https://aomedia.googlesource.com/aom/+archive/${AOM_HASH}.tar.gz --output ${TARGET_FILE_NAME} mkdir $AOM_SOURCES tar xf ${TARGET_FILE_NAME} -C $AOM_SOURCES rm ${TARGET_FILE_NAME}