Merge branch 'feature/libfribidi_intgration' into development

# Conflicts:
#	scripts/common-functions.sh
#	scripts/parse-arguments.sh
ffmpeg_4.4.2
Javernaut 4 years ago
commit 1ea2b982da
  1. 2
      scripts/common-functions.sh
  2. 23
      scripts/libfribidi/build.sh
  3. 9
      scripts/libfribidi/download.sh
  4. 4
      scripts/parse-arguments.sh

@ -17,7 +17,7 @@ function downloadTarArchive() {
echo "Ensuring sources of ${LIBRARY_NAME} in ${LIBRARY_SOURCES}"
if [[ ! -d "$LIBRARY_SOURCES" ]]; then
curl -L -O ${DOWNLOAD_URL}
curl -LO ${DOWNLOAD_URL}
EXTRACTION_DIR="."
if [ "$NEED_EXTRA_DIRECTORY" = true ] ; then

@ -0,0 +1,23 @@
#!/usr/bin/env bash
./configure \
--prefix=${INSTALL_DIR} \
--host=${TARGET} \
--with-sysroot=${SYSROOT_PATH} \
--disable-shared \
--enable-static \
--disable-dependency-tracking \
--disable-fast-install \
--disable-debug \
--disable-deprecated \
--with-pic \
CC=${FAM_CC} \
AR=${FAM_AR} \
RANLIB=${FAM_RANLIB} || exit 1
${MAKE_EXECUTABLE} clean
# Compiling only the static library. Just 'make' will build an executable and docs as well.
${MAKE_EXECUTABLE} -j${HOST_NPROC} -C lib
${MAKE_EXECUTABLE} install -C lib
# Installing the .pc file
${MAKE_EXECUTABLE} install-data-am

@ -0,0 +1,9 @@
#!/usr/bin/env bash
source ${SCRIPTS_DIR}/common-functions.sh
FRIBIDI_VERSION=1.0.10
downloadTarArchive \
"libfribidi" \
"https://github.com/fribidi/fribidi/releases/download/v${FRIBIDI_VERSION}/fribidi-${FRIBIDI_VERSION}.tar.xz"

@ -23,6 +23,7 @@ ALL_SUPPORTED_LIBRARIES=(
"libspeex"
"libvpx"
"libfreetype"
"libfribidi"
)
for argument in "$@"; do
@ -106,6 +107,9 @@ for argument in "$@"; do
--enable-libfreetype|-freetype)
EXTERNAL_LIBRARIES+=( "libfreetype" )
;;
--enable-libfribidi|-fribidi)
EXTERNAL_LIBRARIES+=( "libfribidi" )
;;
--enable-all-external|-all)
EXTERNAL_LIBRARIES=${ALL_SUPPORTED_LIBRARIES[@]}
;;

Loading…
Cancel
Save