Merge branch 'master' into media-file

Author: Javernaut

.github/workflows/compilability_check.yml

@@ -8,11 +8,11 @@ jobs:
         abi: [ "armeabi-v7a", "arm64-v8a", "x86", "x86_64" ]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup the environment
         run: |
-          sudo pip3 install meson==1.2.2
+          sudo pip3 install meson==1.4.0
           sudo apt-get install nasm ninja-build
 
       - name: Executing the script

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 **6.1**, but the version can be overridden.
+By default this script downloads and builds the FFmpeg **7.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)

scripts/libaom/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-AOM_VERSION=v3.7.0
+AOM_VERSION=v3.8.2
 
 downloadTarArchive \
   "libaom" \

scripts/libdav1d/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-DAV1D_VERSION=1.3.0
+DAV1D_VERSION=1.4.1
 
 downloadTarArchive \
   "libdav1d" \

scripts/libvpx/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-VPX_VERSION=v1.13.1
+VPX_VERSION=v1.14.0
 
 downloadTarArchive \
   "libvpx" \

scripts/libwavpack/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-WAVPACK_VERSION=5.6.0
+WAVPACK_VERSION=5.7.0
 
 downloadTarArchive \
   "libwavpack" \

scripts/libx265/download.sh

@@ -2,8 +2,10 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-LIBX265_VERSION=3.5
+LIBX265_VERSION=3.6
 
+#  For 3.6 (and presumably above) it is necessary to pass 'true' as the last argument
 downloadTarArchive \
   "libx265" \
-  "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${LIBX265_VERSION}.tar.gz"
+  "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${LIBX265_VERSION}.tar.gz" \
+  true

scripts/libxml2/build.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+./autogen.sh \
+    --prefix=${INSTALL_DIR} \
+    --host=${TARGET} \
+    --with-sysroot=${SYSROOT_PATH} \
+    --disable-shared \
+    --disable-fast-install \
+    --enable-static \
+    --with-zlib \
+    --with-pic \
+    --without-python \
+    --without-debug \
+    --without-lzma \
+    CC=${FAM_CC} \
+    AR=${FAM_AR} \
+    RANLIB=${FAM_RANLIB} || exit 1
+
+export FFMPEG_EXTRA_LD_FLAGS="${FFMPEG_EXTRA_LD_FLAGS} -lm -lz"
+
+${MAKE_EXECUTABLE} clean
+${MAKE_EXECUTABLE} -j${HOST_NPROC}
+${MAKE_EXECUTABLE} install

scripts/libxml2/download.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source ${SCRIPTS_DIR}/common-functions.sh
+
+XML_VERSION=2.11.7
+
+downloadTarArchive \
+  "libxml2" \
+  "https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${XML_VERSION}/libxml2-v${XML_VERSION}.tar.gz"

scripts/mbedtls/download.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 
-source ${SCRIPTS_DIR}/common-functions.sh
+MBEDTLS_VERSION=v3.6.0
 
-export MBEDTLS_VERSION=3.5.1
-downloadTarArchive \
-  "mbedtls" \
-  "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${MBEDTLS_VERSION}.tar.gz" \
-  true
+git clone \
+ --depth 1 \
+ --branch $MBEDTLS_VERSION \
+ --recursive \
+ https://github.com/Mbed-TLS/mbedtls.git \
+ $MBEDTLS_VERSION
+
+LIBRARY_NAME=mbedtls
+export SOURCES_DIR_${LIBRARY_NAME}=$(pwd)/${MBEDTLS_VERSION}

scripts/parse-arguments.sh

@@ -9,7 +9,7 @@
 ABIS_TO_BUILD=()
 API_LEVEL=21
 SOURCE_TYPE=TAR
-SOURCE_VALUE=6.1
+SOURCE_VALUE=7.0
 EXTERNAL_LIBRARIES=()
 FFMPEG_GPL_ENABLED=false
 
@@ -27,6 +27,7 @@ SUPPORTED_LIBRARIES_FREE=(
   "libfribidi"
   "mbedtls"
   "libbluray"
+  "libxml2"
 )
 
 # All GPL libraries that are supported
@@ -124,6 +125,9 @@ for argument in "$@"; do
   --enable-libbluray | -bluray)
     EXTERNAL_LIBRARIES+=("libbluray")
     ;; 
+  --enable-libxml2 | -xml2)
+    EXTERNAL_LIBRARIES+=("libxml2")
+    ;;
   --enable-all-free | -all-free)
     EXTERNAL_LIBRARIES+=" ${SUPPORTED_LIBRARIES_FREE[@]}"
     ;;

tools/docker/Dockerfile

@@ -2,12 +2,12 @@ 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=10406996
-ARG VERSION_NDK=26.1.10909125
+ARG VERSION_SDK=11076708
+ARG VERSION_NDK=26.2.11394342
 ARG VERSION_CMAKE=3.22.1
 
 # Package to install via pip3
-ARG VERSION_MESON=1.2.2
+ARG VERSION_MESON=1.4.0
 
 # 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'