From 56e82f9ed0af85253ab06e1c7b0875fdf4c27f6e Mon Sep 17 00:00:00 2001 From: hanbowen Date: Thu, 16 Jun 2022 16:24:20 +0800 Subject: [PATCH 1/2] add libbluray --- scripts/libbluray/build.sh | 24 ++++++++++++++++++++++++ scripts/libbluray/download.sh | 10 ++++++++++ scripts/parse-arguments.sh | 5 +++++ 3 files changed, 39 insertions(+) create mode 100755 scripts/libbluray/build.sh create mode 100755 scripts/libbluray/download.sh diff --git a/scripts/libbluray/build.sh b/scripts/libbluray/build.sh new file mode 100755 index 0000000..8791124 --- /dev/null +++ b/scripts/libbluray/build.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +LIBLURAY_ADDITIONAL_FLAGS= + +CC=${FAM_CC} \ +AR=${FAM_AR} \ +AS=${X264_AS} \ +RANLIB=${FAM_RANLIB} \ +STRIP=${FAM_STRIP} \ +LIBS="-lz" \ +./configure \ + --prefix=${INSTALL_DIR} \ + --host=${TARGET} \ + --with-sysroot=${SYSROOT_PATH} \ + --enable-static \ + --with-pic \ + --without-libxml2 \ + --without-fontconfig \ + --disable-bdjava-jar \ + ${LIBLURAY_ADDITIONAL_FLAGS} || exit 1 + +${MAKE_EXECUTABLE} clean +${MAKE_EXECUTABLE} -j${HOST_NPROC} +${MAKE_EXECUTABLE} install diff --git a/scripts/libbluray/download.sh b/scripts/libbluray/download.sh new file mode 100755 index 0000000..cf86e19 --- /dev/null +++ b/scripts/libbluray/download.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +source ${SCRIPTS_DIR}/common-functions.sh + +LIBBLURAY_VERSION=1.3.1 + +downloadTarArchive \ + "libbluray" \ + "https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2" + diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index b8cdc43..862f06d 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -25,6 +25,7 @@ SUPPORTED_LIBRARIES_FREE=( "libwebp" "libfreetype" "libfribidi" + "libbluray" ) # All GPL libraries that are supported @@ -111,6 +112,10 @@ for argument in "$@"; do EXTERNAL_LIBRARIES+=("libx264") FFMPEG_GPL_ENABLED=true ;; + --enable-libbluray | -libbluray) + EXTERNAL_LIBRARIES+=("libfreetype") + EXTERNAL_LIBRARIES+=("libbluray") + ;; --enable-all-free | -all-free) EXTERNAL_LIBRARIES+=" ${SUPPORTED_LIBRARIES_FREE[@]}" ;; From a2859f9ce04ed7d36fb52ca12e8d31be5fea3cb9 Mon Sep 17 00:00:00 2001 From: hanbowen Date: Fri, 17 Jun 2022 20:50:05 +0800 Subject: [PATCH 2/2] 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)