From a2859f9ce04ed7d36fb52ca12e8d31be5fea3cb9 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Fri, 17 Jun 2022 20:50:05 +0800 Subject: [PATCH] rename short argument libbluray to bluray delete unused variables --- scripts/libbluray/build.sh | 7 ++----- scripts/parse-arguments.sh | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/libbluray/build.sh b/scripts/libbluray/build.sh index 8791124..1dc112c 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,7 @@ 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/parse-arguments.sh b/scripts/parse-arguments.sh index 862f06d..52636b0 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)