diff --git a/.travis.yml b/.travis.yml index cf6c930..802edbc 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: - - bash -e ffmpeg-android-maker.sh --enable-libdav1d --enable-libmp3lame --enable-libaom --android-api-level=18 + - bash -e ffmpeg-android-maker.sh --enable-libdav1d --enable-libmp3lame --enable-libaom --enable-libopus --android-api-level=18 diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh index 87e4e4d..f051a3a 100755 --- a/scripts/ffmpeg/build.sh +++ b/scripts/ffmpeg/build.sh @@ -34,6 +34,7 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS" --enable-shared \ --disable-static \ --pkg-config=$(which pkg-config) \ + --pkg-config-flags="--static" \ ${EXTRA_BUILD_CONFIGURATION_FLAGS} \ $ADDITIONAL_COMPONENTS diff --git a/scripts/libmp3lame/build.sh b/scripts/libmp3lame/build.sh index 2975b36..f918c25 100755 --- a/scripts/libmp3lame/build.sh +++ b/scripts/libmp3lame/build.sh @@ -15,8 +15,6 @@ AR=${FAM_AR} \ RANLIB=${FAM_RANLIB} -export FFMPEG_EXTRA_LD_FLAGS="${FFMPEG_EXTRA_LD_FLAGS} -lmp3lame" - ${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} -j${HOST_NPROC} ${MAKE_EXECUTABLE} install diff --git a/scripts/libopus/build.sh b/scripts/libopus/build.sh new file mode 100755 index 0000000..adc1b3a --- /dev/null +++ b/scripts/libopus/build.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +./configure \ + --prefix=${INSTALL_DIR} \ + --host=${TARGET} \ + --disable-shared \ + --enable-static \ + --disable-fast-install \ + --with-pic \ + --with-sysroot=${SYSROOT_PATH} \ + --enable-asm \ + --enable-check-asm \ + --disable-rtcd \ + --disable-doc \ + --disable-extra-programs \ + CC=${FAM_CC} \ + CCLD=${FAM_LD} \ + CCAS=${FAM_AS} \ + RANLIB=${FAM_RANLIB} \ + AR=${FAM_AR} + +${MAKE_EXECUTABLE} clean +${MAKE_EXECUTABLE} -j${HOST_NPROC} +${MAKE_EXECUTABLE} install