From d79d0e5f87bb35054b977f1b16db23e034113591 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 Oct 2021 21:18:27 +0300 Subject: [PATCH 1/6] Dav1d. Using [built-in options] instead of [paths] to eliminate the deprecation warning --- scripts/libdav1d/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libdav1d/build.sh b/scripts/libdav1d/build.sh index b186ac6..c5ff8d9 100755 --- a/scripts/libdav1d/build.sh +++ b/scripts/libdav1d/build.sh @@ -22,7 +22,7 @@ cpu_family = '${CPU_FAMILY}' cpu = '${TARGET_TRIPLE_MACHINE_ARCH}' endian = 'little' -[paths] +[built-in options] prefix = '${INSTALL_DIR}' EOF From 7d1ab7345bbafb73a89e6eb9c4be73deb7e05ce3 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 Oct 2021 21:19:29 +0300 Subject: [PATCH 2/6] Updating libdav1d to 0.9.2 --- 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 e393ac2..c0cb690 100755 --- a/scripts/libdav1d/download.sh +++ b/scripts/libdav1d/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -DAV1D_VERSION=0.9.0 +DAV1D_VERSION=0.9.2 downloadTarArchive \ "libdav1d" \ From 22558f198c1e25377d9deb938a3ed23ae9ea3a45 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 Oct 2021 21:35:58 +0300 Subject: [PATCH 3/6] Updating libaom to 3.2.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 dad8889..e0afee3 100755 --- a/scripts/libaom/download.sh +++ b/scripts/libaom/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -AOM_VERSION=v3.1.2 +AOM_VERSION=v3.2.0 downloadTarArchive \ "libaom" \ From 8d7bb921a994e30509736047f580422d3ba75c47 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 Oct 2021 21:37:27 +0300 Subject: [PATCH 4/6] Updating libfreetype to 2.11.0 --- scripts/libfreetype/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libfreetype/download.sh b/scripts/libfreetype/download.sh index 5184c6f..7d83606 100755 --- a/scripts/libfreetype/download.sh +++ b/scripts/libfreetype/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -FREETYPE_VERSION=2.10.2 +FREETYPE_VERSION=2.11.0 downloadTarArchive \ "libfreetype" \ From aa9851879b549e173e87387a41c8c731abcc07e1 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 23 Oct 2021 21:38:27 +0300 Subject: [PATCH 5/6] Updating libfribidi to 1.0.11 --- scripts/libfribidi/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libfribidi/download.sh b/scripts/libfribidi/download.sh index f64b7d7..4329007 100755 --- a/scripts/libfribidi/download.sh +++ b/scripts/libfribidi/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -FRIBIDI_VERSION=1.0.10 +FRIBIDI_VERSION=1.0.11 downloadTarArchive \ "libfribidi" \ From 41ae87b0f054f5785b72dfdf3852062e008b17e0 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 25 Oct 2021 08:29:50 +0300 Subject: [PATCH 6/6] Using FFmpeg 4.4.1 by default --- README.md | 2 +- scripts/parse-arguments.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea10af7..dd69d82 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.4**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **4.4.1**, 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 f818a2b..eb9fd3a 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -9,7 +9,7 @@ ABIS_TO_BUILD=() API_LEVEL=19 SOURCE_TYPE=TAR -SOURCE_VALUE=4.4 +SOURCE_VALUE=4.4.1 EXTERNAL_LIBRARIES=() FFMPEG_GPL_ENABLED=false