Merge branch 'development' into mbedtls

ffmpeg_4.4.2
ClayM0re 2 years ago committed by GitHub
commit de9ca7e77e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 21
      scripts/libbluray/build.sh
  2. 10
      scripts/libbluray/download.sh
  3. 3
      scripts/parse-arguments.sh

@ -0,0 +1,21 @@
#!/usr/bin/env bash
CC=${FAM_CC} \
AR=${FAM_AR} \
AS=${FAM_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 || exit 1
${MAKE_EXECUTABLE} clean
${MAKE_EXECUTABLE} -j${HOST_NPROC}
${MAKE_EXECUTABLE} install

@ -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"

@ -27,6 +27,7 @@ SUPPORTED_LIBRARIES_FREE=(
"libfreetype"
"libfribidi"
"mbedtls"
"libbluray"
)
# All GPL libraries that are supported
@ -116,6 +117,8 @@ for argument in "$@"; do
--enable-mbedtls | -mbedtls)
EXTERNAL_LIBRARIES+=("mbedtls")
FFMPEG_MBEDTLS_ENABLED=true
--enable-libbluray | -bluray)
EXTERNAL_LIBRARIES+=("libbluray")
;;
--enable-all-free | -all-free)
EXTERNAL_LIBRARIES+=" ${SUPPORTED_LIBRARIES_FREE[@]}"

Loading…
Cancel
Save