From 0d5a8ca20e5e3e7dbe20f9cc92ec942a7304c637 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 28 Mar 2021 21:59:21 +0300 Subject: [PATCH 1/8] Upcoming FFmpeg 4.4 test --- .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 e3ff2ce..5042be1 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -18,4 +18,4 @@ jobs: - name: Executing the script run: | export ANDROID_SDK_HOME=$ANDROID_HOME - ./ffmpeg-android-maker.sh -all-free -all-gpl -android=18 -abis=${{ matrix.abi }} \ No newline at end of file + ./ffmpeg-android-maker.sh -all-free -all-gpl -android=18 -abis=${{ matrix.abi }} --source-git-branch=release/4.4 \ No newline at end of file From e8eed54dda0ea3008843f8460b72881f158f35c1 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 12 Apr 2021 10:31:04 +0300 Subject: [PATCH 2/8] skipping libwavpack --- scripts/parse-arguments.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index a27fb8d..756c46c 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -20,7 +20,6 @@ SUPPORTED_LIBRARIES_FREE=( "libdav1d" "libmp3lame" "libopus" - "libwavpack" "libtwolame" "libspeex" "libvpx" From b9ef07997352d7edd4ec3cdc4f7ef556e0d37f92 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 1 Aug 2021 15:58:20 +0300 Subject: [PATCH 3/8] Update AOM to 3.2.1 --- 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 73a0b48..dad8889 100755 --- a/scripts/libaom/download.sh +++ b/scripts/libaom/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -AOM_VERSION=v2.0.2 +AOM_VERSION=v3.1.2 downloadTarArchive \ "libaom" \ From e00ccbc19343f7636eab7af86c5166b896926656 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 1 Aug 2021 15:59:29 +0300 Subject: [PATCH 4/8] Update dav1d to 0.9.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 4dc80e7..e393ac2 100755 --- a/scripts/libdav1d/download.sh +++ b/scripts/libdav1d/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -DAV1D_VERSION=0.8.1 +DAV1D_VERSION=0.9.0 downloadTarArchive \ "libdav1d" \ From f6bf1c6d3ef92cffa042f3bc4d51e21efc4b34e5 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 1 Aug 2021 16:02:48 +0300 Subject: [PATCH 5/8] Update x264 to 5db6aa6cab1b146e07b60cc1736a01f21da01154 --- scripts/libx264/download.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libx264/download.sh b/scripts/libx264/download.sh index 3933745..8e47835 100755 --- a/scripts/libx264/download.sh +++ b/scripts/libx264/download.sh @@ -4,8 +4,8 @@ source ${SCRIPTS_DIR}/common-functions.sh # Libx264 doesn't have any versioning system. Currently it has 2 branches: master and stable. # Latest commit in stable branch -# Thu Jan 21 16:41:42 2021 +0300 -LIBX264_VERSION=544c61f082194728d0391fb280a6e138ba320a96 +# Jun 13, 2021 3:43pm GMT+0300 +LIBX264_VERSION=5db6aa6cab1b146e07b60cc1736a01f21da01154 downloadTarArchive \ "libx264" \ From 111a6644f34e128e1a516a65f17074a5cdcd3d55 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 1 Aug 2021 16:21:24 +0300 Subject: [PATCH 6/8] Update libvpx to 1.10.0 --- scripts/libvpx/download.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libvpx/download.sh b/scripts/libvpx/download.sh index fc011ee..4730d80 100755 --- a/scripts/libvpx/download.sh +++ b/scripts/libvpx/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -VPX_VERSION=v1.9.0 +VPX_VERSION=v1.10.0 downloadTarArchive \ "libvpx" \ From fc7a3081bc9461d3ae5d1f19724236c88b275584 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 1 Aug 2021 16:26:19 +0300 Subject: [PATCH 7/8] Using the default (4.4) version of FFmpeg to build --- .github/workflows/compilability_check.yml | 2 +- README.md | 2 +- scripts/parse-arguments.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml index 5042be1..e3ff2ce 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -18,4 +18,4 @@ jobs: - name: Executing the script run: | export ANDROID_SDK_HOME=$ANDROID_HOME - ./ffmpeg-android-maker.sh -all-free -all-gpl -android=18 -abis=${{ matrix.abi }} --source-git-branch=release/4.4 \ No newline at end of file + ./ffmpeg-android-maker.sh -all-free -all-gpl -android=18 -abis=${{ matrix.abi }} \ No newline at end of file diff --git a/README.md b/README.md index 8786841..a19b48b 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.3.1**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **4.4**, 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 756c46c..9a73929 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.3.1 +SOURCE_VALUE=4.4 BINUTILS=gnu EXTERNAL_LIBRARIES=() FFMPEG_GPL_ENABLED=false From 59dff77936fddf96e358c5c1e347b270621491fb Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sun, 1 Aug 2021 16:28:05 +0300 Subject: [PATCH 8/8] Update meson to 0.58.2 --- .github/workflows/compilability_check.yml | 2 +- tools/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml index e3ff2ce..c486aee 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -12,7 +12,7 @@ jobs: - name: Setup the environment run: | - sudo pip3 install meson==0.57.1 + sudo pip3 install meson==0.58.2 sudo apt-get install nasm ninja-build - name: Executing the script diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 616440a..0e89403 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION_NDK=21.4.7075529 ARG VERSION_CMAKE=3.10.2.4988404 # Package to install via pip3 -ARG VERSION_MESON=0.57.1 +ARG VERSION_MESON=0.58.2 # The HOME variable isn't available for ENV directive (during building an image). # So we define one manually. For alpine and ubuntu it should be '/root'