update external library versions, fixes #85

arthenica · Sep 18, 2021 · 4c2fdb2 · 4c2fdb2
1 parent cb44185
commit 4c2fdb2
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 50 deletions.
diff --git a/ios.sh b/ios.sh
@@ -158,14 +158,6 @@ disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_X86_64_MA
 disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64_MAC_CATALYST}" "${DETECTED_IOS_SDK_VERSION}"
 disable_ios_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64_SIMULATOR}" "${DETECTED_IOS_SDK_VERSION}"
 
-# CHECK SOME RULES FOR .xcframework BUNDLES
-
-# 1. DO NOT ALLOW --lts AND --xcframework OPTIONS TOGETHER
-if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]] && [[ -n ${FFMPEG_KIT_LTS_BUILD} ]]; then
-  echo -e "\n(*) LTS packages does not support xcframework bundles.\n"
-  exit 1
-fi
-
 # CHECK SOME RULES FOR .framework BUNDLES
 
 # 1. DISABLE arm64-mac-catalyst WHEN arm64 IS ENABLED IN framework BUNDLES

diff --git a/macos.sh b/macos.sh
@@ -152,14 +152,6 @@ fi
 # DISABLE NOT SUPPORTED ARCHITECTURES
 disable_macos_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64}" "${DETECTED_MACOS_SDK_VERSION}"
 
-# CHECK SOME RULES FOR .xcframework BUNDLES
-
-# 1. DO NOT ALLOW --lts AND --xcframework OPTIONS TOGETHER
-if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]] && [[ -n ${FFMPEG_KIT_LTS_BUILD} ]]; then
-  echo -e "\n(*) LTS packages does not support xcframework bundles.\n"
-  exit 1
-fi
-
 echo -e "\nBuilding ffmpeg-kit ${BUILD_TYPE_ID}static library for macOS\n"
 echo -e -n "INFO: Building ffmpeg-kit ${BUILD_VERSION} ${BUILD_TYPE_ID}for macOS: " 1>>"${BASEDIR}"/build.log 2>&1
 echo -e "$(date)\n" 1>>"${BASEDIR}"/build.log 2>&1

diff --git a/scripts/android/fontconfig.sh b/scripts/android/fontconfig.sh
@@ -8,6 +8,13 @@ if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_fontconfig
   autoreconf_library "${LIB_NAME}"
 fi
 
+# WORKAROUND TO FIX NOT-APPLIED HAVE_POSIX_FADVISE define ON MACOS
+if [[ -n ${FFMPEG_KIT_LTS_BUILD} ]]; then
+  ${SED_INLINE} "s/(HAVE_POSIX_FADVISE)/(NO_HAVE_POSIX_FADVISE)/g" "${BASEDIR}"/src/"${LIB_NAME}"/src/fccache.c 1>>"${BASEDIR}"/build.log 2>&1 || exit 1
+else
+  ${SED_INLINE} "s/NO_HAVE_POSIX_FADVISE/HAVE_POSIX_FADVISE/g" "${BASEDIR}"/src/"${LIB_NAME}"/src/fccache.c 1>>"${BASEDIR}"/build.log 2>&1 || exit 1
+fi
+
 ./configure \
   --prefix="${LIB_INSTALL_PREFIX}" \
   --with-pic \

diff --git a/scripts/android/freetype.sh b/scripts/android/freetype.sh
@@ -37,4 +37,4 @@ make -j$(get_cpu_count) || return 1
 make install || return 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_freetype_package_config "23.2.17" || return 1
+create_freetype_package_config "24.0.18" || return 1
diff --git a/scripts/android/libaom.sh b/scripts/android/libaom.sh
@@ -56,4 +56,4 @@ make -j$(get_cpu_count) || return 1
 make install || return 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libaom_package_config "3.1.0" || return 1
+create_libaom_package_config "3.1.2" || return 1
diff --git a/scripts/android/libsamplerate.sh b/scripts/android/libsamplerate.sh
@@ -13,13 +13,15 @@ fi
   --with-pic \
   --with-sysroot="${ANDROID_SYSROOT}" \
   --enable-static \
+  --disable-alsa \
   --disable-fftw \
   --disable-shared \
   --disable-fast-install \
   --host="${HOST}" || return 1
 
 # WORKAROUND TO DISABLE BUILDING OF EXAMPLES AND TESTS
-${SED_INLINE} 's/examples tests//g' "${BASEDIR}"/src/"${LIB_NAME}"/Makefile* || return 1
+${SED_INLINE} 's/^examples_/#examples_/g' "${BASEDIR}"/src/"${LIB_NAME}"/Makefile || return 1
+${SED_INLINE} 's/^tests_/#tests_/g' "${BASEDIR}"/src/"${LIB_NAME}"/Makefile || return 1
 
 make -j$(get_cpu_count) || return 1
 

diff --git a/scripts/android/snappy.sh b/scripts/android/snappy.sh
@@ -20,6 +20,7 @@ cmake -Wno-dev \
   -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \
   -DCMAKE_POSITION_INDEPENDENT_CODE=1 \
   -DSNAPPY_BUILD_TESTS=0 \
+  -DSNAPPY_BUILD_BENCHMARKS=0 \
   -DHAVE_LIBLZO2=0 \
   -DHAVE_LIBZ=1 \
   -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_system_processor) \
@@ -30,4 +31,4 @@ make -j$(get_cpu_count) || return 1
 make install || return 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_snappy_package_config "1.1.8" || return 1
+create_snappy_package_config "1.1.9" || return 1
diff --git a/scripts/android/xvidcore.sh b/scripts/android/xvidcore.sh
@@ -26,7 +26,7 @@ fi
   ${ASM_OPTIONS} \
   --host="${HOST}" || return 1
 
-make -j$(get_cpu_count) || return 1
+make || return 1
 
 make install || return 1
 

diff --git a/scripts/apple/freetype.sh b/scripts/apple/freetype.sh
@@ -41,4 +41,4 @@ make -j$(get_cpu_count) || return 1
 make install || return 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_freetype_package_config "23.2.17" || return 1
+create_freetype_package_config "24.0.18" || return 1
diff --git a/scripts/apple/libsamplerate.sh b/scripts/apple/libsamplerate.sh
@@ -13,13 +13,15 @@ fi
   --with-pic \
   --with-sysroot="${SDK_PATH}" \
   --enable-static \
+  --disable-alsa \
   --disable-fftw \
   --disable-shared \
   --disable-fast-install \
   --host="${HOST}" || return 1
 
 # WORKAROUND TO DISABLE BUILDING OF EXAMPLES AND TESTS
-${SED_INLINE} 's/examples tests//g' "${BASEDIR}"/src/"${LIB_NAME}"/Makefile* || return 1
+${SED_INLINE} 's/^examples_/#examples_/g' "${BASEDIR}"/src/"${LIB_NAME}"/Makefile || return 1
+${SED_INLINE} 's/^tests_/#tests_/g' "${BASEDIR}"/src/"${LIB_NAME}"/Makefile || return 1
 
 make -j$(get_cpu_count) || return 1
 

diff --git a/scripts/apple/sdl.sh b/scripts/apple/sdl.sh
@@ -33,6 +33,7 @@ overwrite_file "${FFMPEG_KIT_TMPDIR}"/source/config/config.sub "${BASEDIR}"/src/
   --enable-static \
   --disable-shared \
   --disable-video-opengl \
+  --disable-video-x11 \
   --disable-joystick \
   --disable-haptic \
   ${ASM_OPTIONS} \

diff --git a/scripts/apple/snappy.sh b/scripts/apple/snappy.sh
@@ -25,6 +25,7 @@ cmake -Wno-dev \
   -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \
   -DCMAKE_AS="$AS" \
   -DSNAPPY_BUILD_TESTS=0 \
+  -DSNAPPY_BUILD_BENCHMARKS=0 \
   -DHAVE_LIBLZO2=0 \
   -DHAVE_LIBZ=1 \
   -DCMAKE_SYSTEM_PROCESSOR="$(get_target_cpu)" \
@@ -35,4 +36,4 @@ make -j$(get_cpu_count) || return 1
 make install || return 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_snappy_package_config "1.1.8" || return 1
+create_snappy_package_config "1.1.9" || return 1
diff --git a/scripts/apple/xvidcore.sh b/scripts/apple/xvidcore.sh
@@ -32,7 +32,7 @@ fi
   ${ASM_OPTIONS} \
   --host="${HOST}" || return 1
 
-make -j$(get_cpu_count) || return 1
+make || return 1
 
 make install || return 1
 

diff --git a/scripts/function.sh b/scripts/function.sh
@@ -1299,7 +1299,7 @@ print_redownload_requested_libraries() {
 # 1 - library index
 get_external_library_license_path() {
   case $1 in
-  1) echo "${BASEDIR}/src/$(get_library_name "$1")/docs/LICENSE.TXT" ;;
+  1) echo "${BASEDIR}/src/$(get_library_name "$1")/LICENSE.TXT" ;;
   3 | 39) echo "${BASEDIR}/src/$(get_library_name "$1")/COPYING.LESSERv3" ;;
   5 | 41) echo "${BASEDIR}/src/$(get_library_name "$1")/$(get_library_name "$1")/COPYING" ;;
   19) echo "${BASEDIR}/src/$(get_library_name "$1")/$(get_library_name "$1")/LICENSE" ;;
@@ -1330,8 +1330,8 @@ copy_external_library_license() {
 # 1 - library index
 # 2 - output path
 copy_external_library_license_file() {
-  RESULT=$(cp $(get_external_library_license_path "$1") "$2" 1>>"${BASEDIR}"/build.log 2>&1)
-  if [[ ${RESULT} -ne 0 ]]; then
+  cp $(get_external_library_license_path "$1") "$2" 1>>"${BASEDIR}"/build.log 2>&1
+  if [[ $? -ne 0 ]]; then
     echo 1
     return
   fi

diff --git a/scripts/source.sh b/scripts/source.sh
@@ -23,19 +23,19 @@ get_library_source() {
     ;;
   dav1d)
     SOURCE_REPO_URL="https://github.com/tanersener/dav1d"
-    SOURCE_ID="0.8.2"
+    SOURCE_ID="0.9.2"
     SOURCE_TYPE="TAG"
     ;;
   expat)
     SOURCE_REPO_URL="https://github.com/tanersener/libexpat"
-    SOURCE_ID="R_2_3_0"
+    SOURCE_ID="R_2_4_1"
     SOURCE_TYPE="TAG"
     ;;
   ffmpeg)
     SOURCE_REPO_URL="https://github.com/tanersener/FFmpeg"
-    SOURCE_ID="acd3c101ef4b84aac9c608bfe6ab22431529c48f"
+    SOURCE_ID="90da43557f7257d72e95504f63ae6504406d6eab"
     SOURCE_TYPE="COMMIT"
-    SOURCE_GIT_DESCRIBE="n4.5-dev-1598-gacd3c101ef" # git describe --tags
+    SOURCE_GIT_DESCRIBE="n4.5-dev-2008-g90da43557f" # git describe --tags
     ;;
   fontconfig)
     SOURCE_REPO_URL="https://github.com/tanersener/fontconfig"
@@ -44,7 +44,7 @@ get_library_source() {
     ;;
   freetype)
     SOURCE_REPO_URL="https://github.com/tanersener/freetype2"
-    SOURCE_ID="VER-2-10-2"
+    SOURCE_ID="VER-2-11-0"
     SOURCE_TYPE="TAG"
     ;;
   fribidi)
@@ -69,12 +69,12 @@ get_library_source() {
     ;;
   harfbuzz)
     SOURCE_REPO_URL="https://github.com/tanersener/harfbuzz"
-    SOURCE_ID="2.8.1"
+    SOURCE_ID="2.9.1"
     SOURCE_TYPE="TAG"
     ;;
   jpeg)
     SOURCE_REPO_URL="https://github.com/tanersener/libjpeg-turbo"
-    SOURCE_ID="2.1.0"
+    SOURCE_ID="2.1.1"
     SOURCE_TYPE="TAG"
     ;;
   kvazaar)
@@ -94,12 +94,12 @@ get_library_source() {
     ;;
   libaom)
     SOURCE_REPO_URL="https://github.com/tanersener/libaom"
-    SOURCE_ID="v3.1.0"
+    SOURCE_ID="v3.1.2"
     SOURCE_TYPE="TAG"
     ;;
   libass)
     SOURCE_REPO_URL="https://github.com/tanersener/libass"
-    SOURCE_ID="0.15.0"
+    SOURCE_ID="0.15.2"
     SOURCE_TYPE="TAG"
     ;;
   libiconv)
@@ -114,7 +114,7 @@ get_library_source() {
     ;;
   libogg)
     SOURCE_REPO_URL="https://github.com/tanersener/ogg"
-    SOURCE_ID="v1.3.4"
+    SOURCE_ID="v1.3.5"
     SOURCE_TYPE="TAG"
     ;;
   libpng)
@@ -124,7 +124,7 @@ get_library_source() {
     ;;
   libsamplerate)
     SOURCE_REPO_URL="https://github.com/tanersener/libsamplerate"
-    SOURCE_ID="v0.1.9"
+    SOURCE_ID="0.2.2"
     SOURCE_TYPE="TAG"
     ;;
   libsndfile)
@@ -159,7 +159,7 @@ get_library_source() {
     ;;
   libwebp)
     SOURCE_REPO_URL="https://github.com/tanersener/libwebp"
-    SOURCE_ID="v1.2.0"
+    SOURCE_ID="v1.2.1"
     SOURCE_TYPE="TAG"
     ;;
   libxml2)
@@ -169,7 +169,7 @@ get_library_source() {
     ;;
   nettle)
     SOURCE_REPO_URL="https://github.com/tanersener/nettle"
-    SOURCE_ID="nettle_3.7.2_release_20210321"
+    SOURCE_ID="nettle_3.7.3_release_20210606"
     SOURCE_TYPE="TAG"
     ;;
   opencore-amr)
@@ -204,7 +204,7 @@ get_library_source() {
     ;;
   snappy)
     SOURCE_REPO_URL="https://github.com/tanersener/snappy"
-    SOURCE_ID="1.1.8"
+    SOURCE_ID="1.1.9"
     SOURCE_TYPE="TAG"
     ;;
   soxr)

diff --git a/tvos.sh b/tvos.sh
@@ -152,14 +152,6 @@ fi
 # DISABLE NOT SUPPORTED ARCHITECTURES
 disable_tvos_architecture_not_supported_on_detected_sdk_version "${ARCH_ARM64_SIMULATOR}" "${DETECTED_TVOS_SDK_VERSION}"
 
-# CHECK SOME RULES FOR .xcframework BUNDLES
-
-# 1. DO NOT ALLOW --lts AND --xcframework OPTIONS TOGETHER
-if [[ -n ${FFMPEG_KIT_XCF_BUILD} ]] && [[ -n ${FFMPEG_KIT_LTS_BUILD} ]]; then
-  echo -e "\n(*) LTS packages does not support xcframework bundles.\n"
-  exit 1
-fi
-
 # CHECK SOME RULES FOR .framework BUNDLES
 
 # 1. DISABLE arm64-simulator WHEN arm64 IS ENABLED IN framework BUNDLES