diff --git a/scripts/export-build-variables.sh b/scripts/export-build-variables.sh index d913f85..beca8d6 100755 --- a/scripts/export-build-variables.sh +++ b/scripts/export-build-variables.sh @@ -81,6 +81,9 @@ export FAM_YASM=${TOOLCHAIN_PATH}/bin/yasm # A variable to which certain dependencies can add -l arguments during build.sh export FFMPEG_EXTRA_LD_FLAGS= +# A variable to which certain dependencies can add addtional arguments during ffmpeg build.sh +export EXTRA_BUILD_CONFIGURATION_FLAGS= + export INSTALL_DIR=${BUILD_DIR_EXTERNAL}/${ANDROID_ABI} # Forcing FFmpeg and its dependencies to look for dependencies diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh index 18f7b29..d0078ca 100755 --- a/scripts/ffmpeg/build.sh +++ b/scripts/ffmpeg/build.sh @@ -3,10 +3,10 @@ case $ANDROID_ABI in x86) # Disabling assembler optimizations, because they have text relocations - EXTRA_BUILD_CONFIGURATION_FLAGS=--disable-asm + EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --disable-asm" ;; x86_64) - EXTRA_BUILD_CONFIGURATION_FLAGS=--x86asmexe=${FAM_YASM} + EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --x86asmexe=${FAM_YASM}" ;; esac diff --git a/scripts/mbedtls/build.sh b/scripts/mbedtls/build.sh new file mode 100755 index 0000000..91b0c19 --- /dev/null +++ b/scripts/mbedtls/build.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +CMAKE_BUILD_DIR=mbedtls_build_${ANDROID_ABI} +# mbedtls authors park their source in a directory named mbedtls-${MBEDTLS_VERSION} +# instead of root directory +cd mbedtls-${MBEDTLS_VERSION} +rm -rf ${CMAKE_BUILD_DIR} +mkdir ${CMAKE_BUILD_DIR} +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_INSTALL_PREFIX=${INSTALL_DIR} \ + -DENABLE_TESTING=0 + +${MAKE_EXECUTABLE} -j${HOST_NPROC} +${MAKE_EXECUTABLE} install + +export EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --enable-protocol=https --enable-version3" \ No newline at end of file diff --git a/scripts/mbedtls/download.sh b/scripts/mbedtls/download.sh new file mode 100755 index 0000000..f2ca614 --- /dev/null +++ b/scripts/mbedtls/download.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +source ${SCRIPTS_DIR}/common-functions.sh + +export MBEDTLS_VERSION=2.28.0 +downloadTarArchive \ + "mbedtls" \ + "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${MBEDTLS_VERSION}.tar.gz" \ + true \ No newline at end of file diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index 1730590..9a5e32e 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -25,6 +25,7 @@ SUPPORTED_LIBRARIES_FREE=( "libwebp" "libfreetype" "libfribidi" + "mbedtls" "libbluray" ) @@ -112,6 +113,9 @@ for argument in "$@"; do EXTERNAL_LIBRARIES+=("libx264") FFMPEG_GPL_ENABLED=true ;; + --enable-mbedtls | -mbedtls) + EXTERNAL_LIBRARIES+=("mbedtls") + ;; --enable-libbluray | -bluray) EXTERNAL_LIBRARIES+=("libbluray") ;;