From acf3c9573d898fe27f6ab111eb30dc17a6b85a7e Mon Sep 17 00:00:00 2001 From: Javernaut Date: Wed, 22 Apr 2020 16:25:06 +0300 Subject: [PATCH] libtwolame is now supported (without libsndfile) --- .travis.yml | 2 +- scripts/libtwolame/build.sh | 21 +++++++++++++++++++++ scripts/libtwolame/download.sh | 9 +++++++++ scripts/parse-arguments.sh | 5 ++++- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 scripts/libtwolame/build.sh create mode 100755 scripts/libtwolame/download.sh diff --git a/.travis.yml b/.travis.yml index 2c88a5d..82e6918 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - curl http://archive.ubuntu.com/ubuntu/pool/universe/n/nasm/nasm_2.14.02-1_amd64.deb --output $HOME/nasm_2.14.02-1_amd64.deb - sudo dpkg -i $HOME/nasm_2.14.02-1_amd64.deb script: - - ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -android=18 + - ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -twolame -android=18 diff --git a/scripts/libtwolame/build.sh b/scripts/libtwolame/build.sh new file mode 100755 index 0000000..47404e5 --- /dev/null +++ b/scripts/libtwolame/build.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +# TODO Consider adding a dependency - libsndfile + +./configure \ + --prefix=${INSTALL_DIR} \ + --host=${TARGET} \ + --with-sysroot=${SYSROOT_PATH} \ + --disable-shared \ + --enable-static \ + --with-pic \ + --disable-sndfile \ + CC=${FAM_CC} \ + AR=${FAM_AR} \ + RANLIB=${FAM_RANLIB} || exit 1 + +export FFMPEG_EXTRA_LD_FLAGS="${FFMPEG_EXTRA_LD_FLAGS} -lm" + +${MAKE_EXECUTABLE} clean +${MAKE_EXECUTABLE} -j${HOST_NPROC} +${MAKE_EXECUTABLE} install diff --git a/scripts/libtwolame/download.sh b/scripts/libtwolame/download.sh new file mode 100755 index 0000000..e3c80f7 --- /dev/null +++ b/scripts/libtwolame/download.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +source ${SCRIPTS_DIR}/common-functions.sh + +TWOLAME_VERSION=0.4.0 + +downloadTarArchive \ + "libtwolame" \ + "https://netix.dl.sourceforge.net/project/twolame/twolame/${TWOLAME_VERSION}/twolame-${TWOLAME_VERSION}.tar.gz" diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index c28e295..9b8e88f 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -79,9 +79,12 @@ for argument in "$@"; do --enable-libopus|-opus) EXTERNAL_LIBRARIES+=( "libopus" ) ;; - --enable-wavpack|-wavpack) + --enable-libwavpack|-wavpack) EXTERNAL_LIBRARIES+=( "libwavpack" ) ;; + --enable-libtwolame|-twolame) + EXTERNAL_LIBRARIES+=( "libtwolame" ) + ;; *) echo "Unknown argument $argument" ;;