From fee1e3a0024cd1407a7c8e49c5cb8d99ce60f9e1 Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:04:04 +0530 Subject: [PATCH 01/14] add libwebp scripts --- scripts/libwebp/build.sh | 0 scripts/libwebp/download.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 scripts/libwebp/build.sh create mode 100644 scripts/libwebp/download.sh diff --git a/scripts/libwebp/build.sh b/scripts/libwebp/build.sh new file mode 100644 index 0000000..e69de29 diff --git a/scripts/libwebp/download.sh b/scripts/libwebp/download.sh new file mode 100644 index 0000000..e69de29 From ce79707315c6be1d167bff4d51db9ff434b86ae5 Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:04:46 +0530 Subject: [PATCH 02/14] update libwebp download script --- scripts/libwebp/download.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/libwebp/download.sh b/scripts/libwebp/download.sh index e69de29..f64977b 100644 --- a/scripts/libwebp/download.sh +++ b/scripts/libwebp/download.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +source ${SCRIPTS_DIR}/common-functions.sh + +WEBP_VERSION=1.2.1 + +downloadTarArchive \ + "libwebp" \ + "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz" From f3519c61a52595b4bc3192523127dda4e09b413a Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:08:42 +0530 Subject: [PATCH 03/14] update libwebp build.sh --- scripts/libwebp/build.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/libwebp/build.sh b/scripts/libwebp/build.sh index e69de29..809b5fb 100644 --- a/scripts/libwebp/build.sh +++ b/scripts/libwebp/build.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +export CC=${FAM_CC} + +./configure \ + --prefix=${INSTALL_DIR} \ + --host=${TARGET} \ + --with-sysroot=${SYSROOT_PATH} \ + --target=${TARGET} || exit 1 + +${MAKE_EXECUTABLE} clean +${MAKE_EXECUTABLE} -j${HOST_NPROC} +${MAKE_EXECUTABLE} install From cf11f4129258e3999ae29563d30ed5d19e44bb39 Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:09:39 +0530 Subject: [PATCH 04/14] add libwebp support --- scripts/parse-arguments.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index eb9fd3a..3aeeacb 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -22,6 +22,7 @@ SUPPORTED_LIBRARIES_FREE=( "libtwolame" "libspeex" "libvpx" + "libwebp" "libfreetype" "libfribidi" ) @@ -85,6 +86,9 @@ for argument in "$@"; do --enable-libopus | -opus) EXTERNAL_LIBRARIES+=("libopus") ;; + --enable-webp | -webp) + EXTERNAL_LIBRARIES+=("libwep") + ;; --enable-libwavpack | -wavpack) EXTERNAL_LIBRARIES+=("libwavpack") ;; From 613b3b51ee495ce46d64658f65889652387e4ff9 Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Thu, 30 Dec 2021 17:11:18 +0530 Subject: [PATCH 05/14] fix host --- scripts/libwebp/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libwebp/build.sh b/scripts/libwebp/build.sh index 809b5fb..ec17098 100644 --- a/scripts/libwebp/build.sh +++ b/scripts/libwebp/build.sh @@ -4,7 +4,7 @@ export CC=${FAM_CC} ./configure \ --prefix=${INSTALL_DIR} \ - --host=${TARGET} \ + --host=${TARGET_TRIPLE_MACHINE_ARCH}-linux-android \ --with-sysroot=${SYSROOT_PATH} \ --target=${TARGET} || exit 1 From 7918d8d7ecb5d23a07de1ea3cd33a32cf0cd4187 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 3 Jan 2022 11:20:38 +0200 Subject: [PATCH 06/14] Checking the compilability on Pull Requests --- .github/workflows/compilability_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml index e3f5a50..845f7e1 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -1,5 +1,5 @@ name: Compilability check -on: push +on: [push, pull_request] jobs: build: runs-on: ubuntu-20.04 From c7a97efe051610fcd2373a1365bdf40674048ef1 Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Mon, 3 Jan 2022 15:08:42 +0530 Subject: [PATCH 07/14] fix typo --- scripts/parse-arguments.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index 3aeeacb..6f3361b 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -87,7 +87,7 @@ for argument in "$@"; do EXTERNAL_LIBRARIES+=("libopus") ;; --enable-webp | -webp) - EXTERNAL_LIBRARIES+=("libwep") + EXTERNAL_LIBRARIES+=("libwebp") ;; --enable-libwavpack | -wavpack) EXTERNAL_LIBRARIES+=("libwavpack") From 388294b2ea9a2c003bb849ae13a73f8cbf50acb8 Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Mon, 3 Jan 2022 15:09:06 +0530 Subject: [PATCH 08/14] fix variable export --- scripts/libwebp/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libwebp/build.sh b/scripts/libwebp/build.sh index ec17098..8daf0b5 100644 --- a/scripts/libwebp/build.sh +++ b/scripts/libwebp/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export CC=${FAM_CC} +CC=${FAM_CC} ./configure \ --prefix=${INSTALL_DIR} \ From 8c4b2e8e3b6a8ec22065f70412c978c8483968ec Mon Sep 17 00:00:00 2001 From: mdrokz <33598169+mdrokz@users.noreply.github.com> Date: Mon, 3 Jan 2022 18:04:17 +0530 Subject: [PATCH 09/14] pass CC properly --- scripts/libwebp/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/libwebp/build.sh b/scripts/libwebp/build.sh index 8daf0b5..d2eace7 100644 --- a/scripts/libwebp/build.sh +++ b/scripts/libwebp/build.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash -CC=${FAM_CC} - ./configure \ --prefix=${INSTALL_DIR} \ --host=${TARGET_TRIPLE_MACHINE_ARCH}-linux-android \ --with-sysroot=${SYSROOT_PATH} \ - --target=${TARGET} || exit 1 + --target=${TARGET} \ + CC=${FAM_CC} || exit 1 ${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} -j${HOST_NPROC} From 84727c07a48083da19c8c02d3a349e3beffdcd1e Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 15 Jan 2022 11:13:09 +0200 Subject: [PATCH 10/14] Using FFmpeg 5.0 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 dd69d82..2a2f3fa 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.1**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **5.0**, 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 6f3361b..b8cdc43 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.1 +SOURCE_VALUE=5.0 EXTERNAL_LIBRARIES=() FFMPEG_GPL_ENABLED=false From dc859e0d2ab4b74b48adcd982b26734413659cef Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 25 Mar 2022 17:32:04 +0200 Subject: [PATCH 11/14] Update libaom to 3.3.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 e0afee3..cb05d0a 100755 --- a/scripts/libaom/download.sh +++ b/scripts/libaom/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -AOM_VERSION=v3.2.0 +AOM_VERSION=v3.3.0 downloadTarArchive \ "libaom" \ From 7c33507aac935221daaea517345f0da93aa4224c Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 25 Mar 2022 17:33:25 +0200 Subject: [PATCH 12/14] Update libdav1d to 1.0.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 c0cb690..a97c9cb 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.2 +DAV1D_VERSION=1.0.0 downloadTarArchive \ "libdav1d" \ From de6940c06c718fc5e8004227103c4ab5fcabe9fc Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 25 Mar 2022 17:34:49 +0200 Subject: [PATCH 13/14] Update libfreetype to 2.11.1 --- 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 7d83606..d3481e1 100755 --- a/scripts/libfreetype/download.sh +++ b/scripts/libfreetype/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -FREETYPE_VERSION=2.11.0 +FREETYPE_VERSION=2.11.1 downloadTarArchive \ "libfreetype" \ From 70dafc6ca0b7294e3f417a5b90de2efc5d5276b0 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Fri, 25 Mar 2022 17:38:21 +0200 Subject: [PATCH 14/14] Update libwebp to 1.2.2 --- scripts/libwebp/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libwebp/download.sh b/scripts/libwebp/download.sh index f64977b..6cab448 100644 --- a/scripts/libwebp/download.sh +++ b/scripts/libwebp/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -WEBP_VERSION=1.2.1 +WEBP_VERSION=1.2.2 downloadTarArchive \ "libwebp" \