diff --git a/scripts/libbluray/build.sh b/scripts/libbluray/build.sh index 8791124..3f4ef77 100755 --- a/scripts/libbluray/build.sh +++ b/scripts/libbluray/build.sh @@ -1,10 +1,8 @@ #!/usr/bin/env bash -LIBLURAY_ADDITIONAL_FLAGS= - CC=${FAM_CC} \ AR=${FAM_AR} \ -AS=${X264_AS} \ +AS=${FAM_AS} \ RANLIB=${FAM_RANLIB} \ STRIP=${FAM_STRIP} \ LIBS="-lz" \ @@ -16,8 +14,8 @@ LIBS="-lz" \ --with-pic \ --without-libxml2 \ --without-fontconfig \ - --disable-bdjava-jar \ - ${LIBLURAY_ADDITIONAL_FLAGS} || exit 1 + --disable-bdjava-jar || exit 1 + ${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} -j${HOST_NPROC} diff --git a/scripts/libwebp/build.sh b/scripts/libwebp/build.sh index d2eace7..1d49799 100644 --- a/scripts/libwebp/build.sh +++ b/scripts/libwebp/build.sh @@ -2,10 +2,14 @@ ./configure \ --prefix=${INSTALL_DIR} \ - --host=${TARGET_TRIPLE_MACHINE_ARCH}-linux-android \ + --host=${TARGET} \ --with-sysroot=${SYSROOT_PATH} \ - --target=${TARGET} \ - CC=${FAM_CC} || exit 1 + --disable-shared \ + --enable-static \ + --with-pic \ + CC=${FAM_CC} \ + AR=${FAM_AR} \ + RANLIB=${FAM_RANLIB} || exit 1 ${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} -j${HOST_NPROC} diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index f171778..f55f647 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -112,8 +112,7 @@ for argument in "$@"; do EXTERNAL_LIBRARIES+=("libx264") FFMPEG_GPL_ENABLED=true ;; - --enable-libbluray | -libbluray) - EXTERNAL_LIBRARIES+=("libfreetype") + --enable-libbluray | -bluray) EXTERNAL_LIBRARIES+=("libbluray") ;; --enable-all-free | -all-free)