Merge pull request #4 from bugparty/development

merge Development
pull/66/head
ClayM0re 3 years ago committed by GitHub
commit c2247f067c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      scripts/libbluray/build.sh
  2. 10
      scripts/libwebp/build.sh
  3. 3
      scripts/parse-arguments.sh

@ -1,10 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
LIBLURAY_ADDITIONAL_FLAGS=
CC=${FAM_CC} \ CC=${FAM_CC} \
AR=${FAM_AR} \ AR=${FAM_AR} \
AS=${X264_AS} \ AS=${FAM_AS} \
RANLIB=${FAM_RANLIB} \ RANLIB=${FAM_RANLIB} \
STRIP=${FAM_STRIP} \ STRIP=${FAM_STRIP} \
LIBS="-lz" \ LIBS="-lz" \
@ -16,8 +14,8 @@ LIBS="-lz" \
--with-pic \ --with-pic \
--without-libxml2 \ --without-libxml2 \
--without-fontconfig \ --without-fontconfig \
--disable-bdjava-jar \ --disable-bdjava-jar || exit 1
${LIBLURAY_ADDITIONAL_FLAGS} || exit 1
${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} clean
${MAKE_EXECUTABLE} -j${HOST_NPROC} ${MAKE_EXECUTABLE} -j${HOST_NPROC}

@ -2,10 +2,14 @@
./configure \ ./configure \
--prefix=${INSTALL_DIR} \ --prefix=${INSTALL_DIR} \
--host=${TARGET_TRIPLE_MACHINE_ARCH}-linux-android \ --host=${TARGET} \
--with-sysroot=${SYSROOT_PATH} \ --with-sysroot=${SYSROOT_PATH} \
--target=${TARGET} \ --disable-shared \
CC=${FAM_CC} || exit 1 --enable-static \
--with-pic \
CC=${FAM_CC} \
AR=${FAM_AR} \
RANLIB=${FAM_RANLIB} || exit 1
${MAKE_EXECUTABLE} clean ${MAKE_EXECUTABLE} clean
${MAKE_EXECUTABLE} -j${HOST_NPROC} ${MAKE_EXECUTABLE} -j${HOST_NPROC}

@ -112,8 +112,7 @@ for argument in "$@"; do
EXTERNAL_LIBRARIES+=("libx264") EXTERNAL_LIBRARIES+=("libx264")
FFMPEG_GPL_ENABLED=true FFMPEG_GPL_ENABLED=true
;; ;;
--enable-libbluray | -libbluray) --enable-libbluray | -bluray)
EXTERNAL_LIBRARIES+=("libfreetype")
EXTERNAL_LIBRARIES+=("libbluray") EXTERNAL_LIBRARIES+=("libbluray")
;; ;;
--enable-all-free | -all-free) --enable-all-free | -all-free)

Loading…
Cancel
Save