Using mbedtls 3.4.1

.github/workflows/compilability_check.yml

@@ -12,7 +12,7 @@ jobs:
 
       - name: Setup the environment
         run: |
-          sudo pip3 install meson==1.0.1
+          sudo pip3 install meson==1.2.1
           sudo apt-get install nasm ninja-build
 
       - name: Executing the script

ffmpeg-android-maker.sh

@@ -84,14 +84,13 @@ do
   # Executing the component-specific script for downloading the source code
   source ${SCRIPTS_DIR}/${COMPONENT}/download.sh
 
-  SANITIZED_COMPONENT_NAME=$(echo ${COMPONENT} | sed "s/-/_/")
   # The download.sh script has to export SOURCES_DIR_$COMPONENT variable
   # with actual path of the source code. This is done for possiblity to switch
   # between different verions of a component.
   # If it isn't set, consider SOURCE_DIR_FOR_COMPONENT as the proper value
-  COMPONENT_SOURCES_DIR_VARIABLE=SOURCES_DIR_${SANITIZED_COMPONENT_NAME}
+  COMPONENT_SOURCES_DIR_VARIABLE=SOURCES_DIR_${COMPONENT}
   if [[ -z "${!COMPONENT_SOURCES_DIR_VARIABLE}" ]]; then
-     export SOURCES_DIR_${SANITIZED_COMPONENT_NAME}=${SOURCE_DIR_FOR_COMPONENT}
+     export SOURCES_DIR_${COMPONENT}=${SOURCE_DIR_FOR_COMPONENT}
   fi
 
   # Returning to the rood directory. Just in case.
@@ -107,8 +106,7 @@ do
   for COMPONENT in ${COMPONENTS_TO_BUILD[@]}
   do
     echo "Building the component: ${COMPONENT}"
-    SANITIZED_COMPONENT_NAME=$(echo ${COMPONENT} | sed "s/-/_/")
-    COMPONENT_SOURCES_DIR_VARIABLE=SOURCES_DIR_${SANITIZED_COMPONENT_NAME}
+    COMPONENT_SOURCES_DIR_VARIABLE=SOURCES_DIR_${COMPONENT}
 
     # Going to the actual source code directory of the current component
     cd ${!COMPONENT_SOURCES_DIR_VARIABLE}

scripts/common-functions.sh

@@ -29,6 +29,5 @@ function downloadTarArchive() {
     rm ${ARCHIVE_NAME}
   fi
 
-  SANITIZED_COMPONENT_NAME=$(echo ${LIBRARY_NAME} | sed "s/-/_/")
-  export SOURCES_DIR_${SANITIZED_COMPONENT_NAME}=$(pwd)/${LIBRARY_SOURCES}
+  export SOURCES_DIR_${LIBRARY_NAME}=$(pwd)/${LIBRARY_SOURCES}
 }

scripts/libaom/download.sh

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

scripts/libdav1d/download.sh

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

scripts/libfreetype/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-FREETYPE_VERSION=2.13.0
+FREETYPE_VERSION=2.13.2
 
 downloadTarArchive \
   "libfreetype" \

scripts/libfribidi/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-FRIBIDI_VERSION=1.0.12
+FRIBIDI_VERSION=1.0.13
 
 downloadTarArchive \
   "libfribidi" \

scripts/mbedtls/download.sh

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

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=9477386
+ARG VERSION_SDK=10406996
 ARG VERSION_NDK=25.2.9519653
 ARG VERSION_CMAKE=3.22.1
 
 # Package to install via pip3
-ARG VERSION_MESON=1.0.1
+ARG VERSION_MESON=1.2.1
 
 # 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'