Created
October 30, 2020 09:52
-
-
Save courville/46c7ec0852fd177a87ff9c8d36f47afd to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build.sh b/build.sh | |
index 817c996..c15891b 100755 | |
--- a/build.sh | |
+++ b/build.sh | |
@@ -1,4 +1,4 @@ | |
-#!/bin/bash | |
+#!/bin/bash -x | |
while getopts "a:c:" opt; do | |
case $opt in | |
@@ -98,11 +98,14 @@ else | |
fi | |
-DAV1D_DIR=$(readlink -f ../dav1d-android-builder ) | |
+DAV1D_DIR=$(readlink -f ../dav1d-android-builder) | |
DAV1D_LIB=${DAV1D_DIR}/build-${ABI}/src | |
-echo "dav1d dir is at ${DAV1D_DIR}" | |
+OPUS_DIR=$(readlink -f ../libopus) | |
+OPUS_LIB=${OPUS_DIR}/lib/${ABI} | |
+echo "dav1d dir is at ${DAV1D_DIR}" | |
+echo "libopus dir is at ${OPUS_DIR}" | |
pushd "${FFMPEG_DIR}" | |
@@ -124,11 +127,11 @@ export PKG_CONFIG_LIBDIR=${LOCAL_PATH} | |
--enable-cross-compile --target-os=android \ | |
--prefix="${FFMPEG_DIR}/dist-${FLAVOR}-${ABI}" \ | |
--arch="${ARCH}" ${ARCH_CONFIG_OPT} \ | |
- --extra-cflags="${ARCH_CFLAGS} -fPIC -fPIE -DPIC -D__ANDROID_API__=${ANDROID_API} -I${DAV1D_DIR}/dav1d/include -I${DAV1D_DIR}/build-${ABI}/include -I${DAV1D_DIR}/build-${ABI}/include/dav1d" \ | |
- --extra-ldflags="${ARCH_LDFLAGS} -fPIE -pie -L${DAV1D_LIB}" \ | |
+ --extra-cflags="${ARCH_CFLAGS} -fPIC -fPIE -DPIC -D__ANDROID_API__=${ANDROID_API} -I${DAV1D_DIR}/dav1d/include -I${DAV1D_DIR}/build-${ABI}/include -I${DAV1D_DIR}/build-${ABI}/include/dav1d -I${OPUS_DIR}/build-${ABI} -I${OPUS_DIR}/opus/include" \ | |
+ --extra-ldflags="${ARCH_LDFLAGS} -fPIE -pie -L${DAV1D_LIB} -L${OPUS_LIB}" \ | |
--enable-shared --disable-static --disable-symver --disable-doc \ | |
${CONFIG_LIBAV} > "${FFMPEG_DIR}/dist-${FLAVOR}-${ABI}/configure.log" | |
-make -j16 install | |
+make -j8 install | |
popd | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment