From ea5f5e1b11ad30415147f4e319f0ca57bccd24df Mon Sep 17 00:00:00 2001 From: Alexander Berezhnoi Date: Fri, 1 May 2020 10:39:00 +0300 Subject: [PATCH 1/5] Create LICENSE.txt --- LICENSE.txt | 21 +++++++++++++++++++++ README.md | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..029aaac --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Alexander Berezhnoi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index b3d6c93..5c92e1d 100644 --- a/README.md +++ b/README.md @@ -71,3 +71,7 @@ Certain external libraries require additional software to be installed. Check th **Test your script in a cloud**. This repository has CI integration and you can use it too for your own configurations. See details [here](https://github.com/Javernaut/ffmpeg-android-maker/wiki/Build-automation). **Text relocations monitoring**. After an assembling is finished you can look into stats/text-relocations.txt file. This file lists all \*.so files that were built and reports if any of them has text relocations. If you don't see any mentioning of 'TEXTREL' in the file, you are good. Otherwise, you will see exact binaries that have this problem. The Travis CI build will automatically fail if text relocations occur. + +## License + +The ffmpeg-android-maker's source code is available under the MIT license. See the `LICENSE.txt` file for more details. \ No newline at end of file From 873a2087a580857c108aca167ae8e591f8094e6a Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 3 May 2020 20:18:27 +0300 Subject: [PATCH 2/5] Travis CI. NDK update to r21b --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9668def..e75cf86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ install: - curl https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip --output $HOME/android-sdk.zip - unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk - export ANDROID_SDK_HOME=$HOME/android-sdk - - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.0.6113669 + - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.1.6352462 # Installing necessary components of Android SDK - function installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} $1 > /dev/null; } - - installAndroidComponent "ndk;21.0.6113669" + - installAndroidComponent "ndk;21.1.6352462" - installAndroidComponent "cmake;3.10.2.4988404" # Installing meson, ninja and nasm that are necessary for libdav1d building - sudo apt-get install python3-pip python3-setuptools python3-wheel ninja-build From b6890226722a7d1373441f28abcc3d4869e19eea Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 May 2020 10:18:30 +0300 Subject: [PATCH 3/5] libdav1d is now 0.7.0 --- scripts/libdav1d/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libdav1d/download.sh b/scripts/libdav1d/download.sh index 9697551..eaea41e 100755 --- a/scripts/libdav1d/download.sh +++ b/scripts/libdav1d/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -DAV1D_VERSION=0.6.0 +DAV1D_VERSION=0.7.0 downloadTarArchive \ "libdav1d" \ From 410ef35001b65d05811e32e96a6c0b228f75b510 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 May 2020 10:24:53 +0300 Subject: [PATCH 4/5] Updating FFmpeg to 4.2.3 --- README.md | 2 +- scripts/parse-arguments.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5c92e1d..944ad67 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The script also produces `ffmpeg` and `ffprobe` executables that can be used in The main focus of ffmpeg-android-maker is to prepare shared libraries for seamless integration into an Android project. The script prepares the `output` directory that is meant to be used. And it's not the only thing this project does. -By default this script downloads and builds the FFmpeg **4.2.2**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **4.2.3**, but the version can be overridden. The details of how this script is implemented are described in this series of posts: * [Part 1](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index 0ab1d01..fd0d75e 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -9,7 +9,7 @@ ABIS_TO_BUILD=() API_LEVEL=16 SOURCE_TYPE=TAR -SOURCE_VALUE=4.2.2 +SOURCE_VALUE=4.2.3 BINUTILS=gnu EXTERNAL_LIBRARIES=() From 02b8dbb866dcbd2b41baa87721255ebfaa7bb99e Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 May 2020 10:37:40 +0300 Subject: [PATCH 5/5] Updating libaom to 2.0.0 --- scripts/libaom/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libaom/download.sh b/scripts/libaom/download.sh index c233fba..beba661 100755 --- a/scripts/libaom/download.sh +++ b/scripts/libaom/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -AOM_VERSION=v1.0.0-errata1-avif +AOM_VERSION=v2.0.0 downloadTarArchive \ "libaom" \