Merge branch 'development' into adding/libx265

# Conflicts:
#	.github/workflows/compilability_check.yml

Author: Javernaut

.github/workflows/compilability_check.yml

@@ -18,5 +18,5 @@ jobs:
       - name: Executing the script
         run: |
           export ANDROID_SDK_HOME=$ANDROID_HOME
-          export ANDROID_NDK_HOME=$ANDROID_NDK
+          export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME
           ./ffmpeg-android-maker.sh -x265 -android=24 -abis=${{ matrix.abi }}

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

scripts/libfreetype/download.sh

@@ -6,4 +6,4 @@ FREETYPE_VERSION=2.13.2
 
 downloadTarArchive \
   "libfreetype" \
-  "https://nav.dl.sourceforge.net/project/freetype/freetype2/${FREETYPE_VERSION}/freetype-${FREETYPE_VERSION}.tar.gz"
+  "https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz"

scripts/mbedtls/android.cmake

@@ -0,0 +1,5 @@
+include("$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
+
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+  set(CMAKE_C_FLAGS "-mpclmul -msse2 -maes")
+endif()

scripts/mbedtls/build.sh

@@ -11,7 +11,7 @@ cd ${CMAKE_BUILD_DIR}
 ${CMAKE_EXECUTABLE} .. \
  -DANDROID_PLATFORM=${ANDROID_PLATFORM} \
  -DANDROID_ABI=${ANDROID_ABI} \
- -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
+ -DCMAKE_TOOLCHAIN_FILE=${SCRIPTS_DIR}/mbedtls/android.cmake \
  -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
  -DENABLE_TESTING=0 
 

scripts/mbedtls/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-export MBEDTLS_VERSION=3.4.1
+export MBEDTLS_VERSION=3.5.1
 downloadTarArchive \
   "mbedtls" \
   "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${MBEDTLS_VERSION}.tar.gz" \

scripts/parse-arguments.sh

@@ -7,9 +7,9 @@
 # Can be overridden with specific arguments.
 # See the end of this file for more description.
 ABIS_TO_BUILD=()
-API_LEVEL=19
+API_LEVEL=21
 SOURCE_TYPE=TAR
-SOURCE_VALUE=6.0
+SOURCE_VALUE=6.1
 EXTERNAL_LIBRARIES=()
 FFMPEG_GPL_ENABLED=false
 

tools/docker/Dockerfile

@@ -3,7 +3,7 @@ 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=25.2.9519653
+ARG VERSION_NDK=26.1.10909125
 ARG VERSION_CMAKE=3.22.1
 
 # Package to install via pip3
@@ -25,7 +25,7 @@ RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install
   python3-wheel \
   ninja-build \
   build-essential \
-  openjdk-8-jdk-headless \
+  openjdk-17-jdk-headless \
   curl \
   unzip \
   bash \