diff --git a/.github/workflows/compilability_check.yml b/.github/workflows/compilability_check.yml index 4dedf1f..50d343b 100644 --- a/.github/workflows/compilability_check.yml +++ b/.github/workflows/compilability_check.yml @@ -12,11 +12,11 @@ jobs: - name: Setup the environment run: | - sudo pip3 install meson==1.4.0 + sudo pip3 install meson==1.5.2 sudo apt-get install nasm ninja-build - name: Executing the script run: | export ANDROID_SDK_HOME=$ANDROID_HOME export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME - ./ffmpeg-android-maker.sh -all-free -all-gpl -android=24 -abis=${{ matrix.abi }} \ No newline at end of file + ./ffmpeg-android-maker.sh -all-free -all-gpl -android=24 -abis=${{ matrix.abi }} diff --git a/README.md b/README.md index e55ef28..41a625f 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 **7.0**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **7.0.2**, 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) @@ -78,4 +78,4 @@ Certain external libraries require additional software to be installed. Check th The ffmpeg-android-maker's source code is available under the MIT license. See the `LICENSE.txt` file for more details. -However, the binaries that are produced have different license. The FFmpeg itself is under [LGPL 2.1](http://ffmpeg.org/legal.html). Enabling certain external libraries (like libx264) changes the license to be GPL 2 or later. \ No newline at end of file +However, the binaries that are produced have different license. The FFmpeg itself is under [LGPL 2.1](http://ffmpeg.org/legal.html). Enabling certain external libraries (like libx264) changes the license to be GPL 2 or later. diff --git a/scripts/libaom/download.sh b/scripts/libaom/download.sh index dfd3cf8..3974b9c 100755 --- a/scripts/libaom/download.sh +++ b/scripts/libaom/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -AOM_VERSION=v3.8.2 +AOM_VERSION=v3.10.0 downloadTarArchive \ "libaom" \ diff --git a/scripts/libdav1d/download.sh b/scripts/libdav1d/download.sh index 57a0587..2b832c3 100755 --- a/scripts/libdav1d/download.sh +++ b/scripts/libdav1d/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -DAV1D_VERSION=1.4.1 +DAV1D_VERSION=1.4.3 downloadTarArchive \ "libdav1d" \ diff --git a/scripts/libfreetype/download.sh b/scripts/libfreetype/download.sh index 070989c..6c9357b 100755 --- a/scripts/libfreetype/download.sh +++ b/scripts/libfreetype/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -FREETYPE_VERSION=2.13.2 +FREETYPE_VERSION=2.13.3 downloadTarArchive \ "libfreetype" \ diff --git a/scripts/libfribidi/download.sh b/scripts/libfribidi/download.sh index 3545613..8fa153b 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.13 +FRIBIDI_VERSION=1.0.15 downloadTarArchive \ "libfribidi" \ diff --git a/scripts/libtwolame/download.sh b/scripts/libtwolame/download.sh index e3c80f7..f65d43d 100755 --- a/scripts/libtwolame/download.sh +++ b/scripts/libtwolame/download.sh @@ -6,4 +6,4 @@ TWOLAME_VERSION=0.4.0 downloadTarArchive \ "libtwolame" \ - "https://netix.dl.sourceforge.net/project/twolame/twolame/${TWOLAME_VERSION}/twolame-${TWOLAME_VERSION}.tar.gz" + "https://downloads.videolan.org/pub/contrib/twolame/twolame-${TWOLAME_VERSION}.tar.gz" diff --git a/scripts/libvpx/download.sh b/scripts/libvpx/download.sh index ffb22e2..42bdba9 100755 --- a/scripts/libvpx/download.sh +++ b/scripts/libvpx/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -VPX_VERSION=v1.14.0 +VPX_VERSION=v1.14.1 downloadTarArchive \ "libvpx" \ diff --git a/scripts/libwebp/download.sh b/scripts/libwebp/download.sh index e69844e..0ecae3f 100644 --- a/scripts/libwebp/download.sh +++ b/scripts/libwebp/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -WEBP_VERSION=1.3.2 +WEBP_VERSION=1.4.0 downloadTarArchive \ "libwebp" \ diff --git a/scripts/libx265/download.sh b/scripts/libx265/download.sh index 75bcb3d..6f03f5a 100755 --- a/scripts/libx265/download.sh +++ b/scripts/libx265/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -LIBX265_VERSION=3.6 +LIBX265_VERSION=4.0 downloadTarArchive \ "libx265" \ diff --git a/scripts/libxml2/download.sh b/scripts/libxml2/download.sh index d05cbfb..b744ec1 100755 --- a/scripts/libxml2/download.sh +++ b/scripts/libxml2/download.sh @@ -2,7 +2,7 @@ source ${SCRIPTS_DIR}/common-functions.sh -XML_VERSION=2.11.7 +XML_VERSION=2.13.4 downloadTarArchive \ "libxml2" \ diff --git a/scripts/mbedtls/download.sh b/scripts/mbedtls/download.sh index f5b8933..b635f8f 100755 --- a/scripts/mbedtls/download.sh +++ b/scripts/mbedtls/download.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -MBEDTLS_VERSION=v3.6.0 +MBEDTLS_VERSION=v3.6.1 git clone \ --depth 1 \ @@ -10,4 +10,4 @@ git clone \ $MBEDTLS_VERSION LIBRARY_NAME=mbedtls -export SOURCES_DIR_${LIBRARY_NAME}=$(pwd)/${MBEDTLS_VERSION} \ No newline at end of file +export SOURCES_DIR_${LIBRARY_NAME}=$(pwd)/${MBEDTLS_VERSION} diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index 2925bd5..c2c7b62 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -9,7 +9,7 @@ ABIS_TO_BUILD=() API_LEVEL=21 SOURCE_TYPE=TAR -SOURCE_VALUE=7.0 +SOURCE_VALUE=7.0.2 EXTERNAL_LIBRARIES=() FFMPEG_GPL_ENABLED=false diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index a4d8271..4647ad1 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -3,11 +3,11 @@ FROM --platform=linux/amd64 ubuntu:22.04 # Arguments that can be overridden in 'docker build' command: # Versions of Android SDK and NDK. The CMake is installed via NDK. ARG VERSION_SDK=11076708 -ARG VERSION_NDK=26.2.11394342 +ARG VERSION_NDK=27.1.12297006 ARG VERSION_CMAKE=3.22.1 # Package to install via pip3 -ARG VERSION_MESON=1.4.0 +ARG VERSION_MESON=1.5.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'