Remove FFMPEG_MBEDTLS_ENABLED

Refactor EXTRA_BUILD_CONFIGURATION_FLAGS variable to be available for all libraries for a given ABI(just as FFMPEG_EXTRA_LD_FLAGS
Append the EXTRA_BUILD_CONFIGURATION_FLAGS with --enable-protocol=https --enable-version in mbedtls/build.sh
pull/64/head
hanbowen 2 years ago
parent 4256437638
commit f2197adbca
  1. 3
      scripts/export-build-variables.sh
  2. 8
      scripts/ffmpeg/build.sh
  3. 2
      scripts/mbedtls/build.sh
  4. 1
      scripts/parse-arguments.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 # A variable to which certain dependencies can add -l arguments during build.sh
export FFMPEG_EXTRA_LD_FLAGS= 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} export INSTALL_DIR=${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}
# Forcing FFmpeg and its dependencies to look for dependencies # Forcing FFmpeg and its dependencies to look for dependencies

@ -3,10 +3,10 @@
case $ANDROID_ABI in case $ANDROID_ABI in
x86) x86)
# Disabling assembler optimizations, because they have text relocations # 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) x86_64)
EXTRA_BUILD_CONFIGURATION_FLAGS=--x86asmexe=${FAM_YASM} EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --x86asmexe=${FAM_YASM}"
;; ;;
esac esac
@ -14,10 +14,6 @@ if [ "$FFMPEG_GPL_ENABLED" = true ] ; then
EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --enable-gpl" EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --enable-gpl"
fi fi
if [ "$FFMPEG_MBEDTLS_ENABLED" = true ] ; then
EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --enable-protocol=https --enable-version3"
fi
# Preparing flags for enabling requested libraries # Preparing flags for enabling requested libraries
ADDITIONAL_COMPONENTS= ADDITIONAL_COMPONENTS=
for LIBARY_NAME in ${FFMPEG_EXTERNAL_LIBRARIES[@]} for LIBARY_NAME in ${FFMPEG_EXTERNAL_LIBRARIES[@]}

@ -18,4 +18,4 @@ ${CMAKE_EXECUTABLE} .. \
${MAKE_EXECUTABLE} -j${HOST_NPROC} ${MAKE_EXECUTABLE} -j${HOST_NPROC}
${MAKE_EXECUTABLE} install ${MAKE_EXECUTABLE} install
export FFMPEG_MBEDTLS_ENABLED=true export EXTRA_BUILD_CONFIGURATION_FLAGS="$EXTRA_BUILD_CONFIGURATION_FLAGS --enable-protocol=https --enable-version3"

@ -12,7 +12,6 @@ SOURCE_TYPE=TAR
SOURCE_VALUE=5.0.1 SOURCE_VALUE=5.0.1
EXTERNAL_LIBRARIES=() EXTERNAL_LIBRARIES=()
FFMPEG_GPL_ENABLED=false FFMPEG_GPL_ENABLED=false
FFMPEG_MBEDTLS_ENABLED=false
# All FREE libraries that are supported # All FREE libraries that are supported
SUPPORTED_LIBRARIES_FREE=( SUPPORTED_LIBRARIES_FREE=(

Loading…
Cancel
Save