diff --git a/scripts/android/cpu-features.sh b/scripts/android/cpu-features.sh index 09471bb..9013b5e 100755 --- a/scripts/android/cpu-features.sh +++ b/scripts/android/cpu-features.sh @@ -1,10 +1,10 @@ #!/bin/bash -$(android_ndk_cmake) -DBUILD_PIC=ON || return 1 +$(android_ndk_cmake) || return 1 make -C "$(get_cmake_build_directory)" || return 1 make -C "$(get_cmake_build_directory)" install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_cpufeatures_package_config "0.7.0" || return 1 +create_cpufeatures_package_config "0.8.0" || return 1 diff --git a/scripts/android/fontconfig.sh b/scripts/android/fontconfig.sh index 33c933c..4bb8240 100755 --- a/scripts/android/fontconfig.sh +++ b/scripts/android/fontconfig.sh @@ -37,4 +37,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_fontconfig_package_config "2.14.0" || return 1 +create_fontconfig_package_config "2.14.2" || return 1 diff --git a/scripts/android/freetype.sh b/scripts/android/freetype.sh index 1068488..952236b 100755 --- 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 "24.3.18" || return 1 +create_freetype_package_config "25.0.19" || return 1 diff --git a/scripts/android/giflib.sh b/scripts/android/giflib.sh index ce75034..76051d1 100755 --- a/scripts/android/giflib.sh +++ b/scripts/android/giflib.sh @@ -3,6 +3,9 @@ # UPDATE BUILD FLAGS export CFLAGS=$(get_cflags "${LIB_NAME}")" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR" +# COPY BUILD FILES +cp "${BASEDIR}"/tools/patch/make/giflib/* "${BASEDIR}"/src/"${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 + # ALWAYS CLEAN THE PREVIOUS BUILD make distclean 2>/dev/null 1>/dev/null @@ -25,4 +28,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_giflib_package_config "5.1.4" || return 1 +create_giflib_package_config "5.2.1" || return 1 diff --git a/scripts/android/gmp.sh b/scripts/android/gmp.sh index 3cfc749..13ac682 100755 --- a/scripts/android/gmp.sh +++ b/scripts/android/gmp.sh @@ -24,4 +24,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_gmp_package_config "6.2.0" || return 1 +create_gmp_package_config "6.2.1" || return 1 diff --git a/scripts/android/gnutls.sh b/scripts/android/gnutls.sh index 527df28..2f56a9d 100755 --- a/scripts/android/gnutls.sh +++ b/scripts/android/gnutls.sh @@ -1,5 +1,16 @@ #!/bin/bash +# INIT SUBMODULES +${SED_INLINE} 's|openssl/openssl|arthenica/openssl|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|tomato42|arthenica|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|warner|arthenica|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/libidn/gnulib-mirror|github.com/arthenica/gnulib|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/libtasn1|github.com/arthenica/libtasn1|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/nettle|github.com/arthenica/nettle|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/abi-dump|github.com/arthenica/abi-dump|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/cligen|github.com/arthenica/cligen|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/redhat-crypto/tests/interop|github.com/arthenica/redhat-crypto-tests-interop|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 + # UPDATE BUILD FLAGS export CFLAGS="$(get_cflags ${LIB_NAME}) -I${LIB_INSTALL_BASE}/libiconv/include" export CXXFLAGS=$(get_cxxflags "${LIB_NAME}") @@ -28,12 +39,11 @@ make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_gnutls} -eq 1 ]]; then - ./bootstrap || return 1 + ./bootstrap --skip-po || return 1 + git submodule update --remote gnulib || return 1 + overwrite_file ./gnulib/lib/fpending.c ./src/gl/fpending.c || return 1 fi -# MASKING THE -march=all OPTION WHICH BREAKS THE BUILD ON arm64-v8a -${SED_INLINE} "s|AM_CCASFLAGS =|#AM_CCASFLAGS=|g" "${BASEDIR}"/src/"${LIB_NAME}"/lib/accelerated/aarch64/Makefile.in - ./configure \ --prefix="${LIB_INSTALL_PREFIX}" \ --with-pic \ @@ -62,4 +72,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_gnutls_package_config "3.6.15.1" || return 1 +create_gnutls_package_config "3.7.9" || return 1 diff --git a/scripts/android/libaom.sh b/scripts/android/libaom.sh index f539187..9180c88 100755 --- 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.5.0" || return 1 +create_libaom_package_config "3.6.1" || return 1 diff --git a/scripts/android/libass.sh b/scripts/android/libass.sh index 648d589..28de06f 100755 --- a/scripts/android/libass.sh +++ b/scripts/android/libass.sh @@ -3,7 +3,7 @@ # SET BUILD OPTIONS ASM_OPTIONS="" case ${ARCH} in -x86) +arm* | x86) # please note that asm is disabled # enabling asm for x86 causes text relocations in libavfilter.so diff --git a/scripts/android/libiconv.sh b/scripts/android/libiconv.sh index aef5f39..2d8173f 100755 --- a/scripts/android/libiconv.sh +++ b/scripts/android/libiconv.sh @@ -1,6 +1,7 @@ #!/bin/bash -# PULL SUBMODULES +# INIT SUBMODULES +${SED_INLINE} 's|git://git.savannah.gnu.org|https://github.com/tanersener|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 ./gitsub.sh pull || return 1 # ALWAYS CLEAN THE PREVIOUS BUILD @@ -8,7 +9,7 @@ make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libiconv} -eq 1 ]]; then - autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 + ./autogen.sh || return 1 fi ./configure \ diff --git a/scripts/android/libilbc.sh b/scripts/android/libilbc.sh index c2c14ef..2272499 100755 --- a/scripts/android/libilbc.sh +++ b/scripts/android/libilbc.sh @@ -1,25 +1,38 @@ #!/bin/bash -# ALWAYS CLEAN THE PREVIOUS BUILD -make distclean 2>/dev/null 1>/dev/null +# INIT SUBMODULES +${SED_INLINE} 's|/abseil/|/arthenica/|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +git submodule update --init || return 1 -# REGENERATE BUILD FILES IF NECESSARY OR REQUESTED -if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libilbc} -eq 1 ]]; then - autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 -fi +mkdir -p "${BUILD_DIR}" || return 1 +cd "${BUILD_DIR}" || return 1 -./configure \ - --prefix="${LIB_INSTALL_PREFIX}" \ - --with-pic \ - --with-sysroot="${ANDROID_SYSROOT}" \ - --enable-static \ - --disable-shared \ - --disable-fast-install \ - --host="${HOST}" || return 1 +cmake -Wno-dev \ + -DCMAKE_VERBOSE_MAKEFILE=0 \ + -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ + -DCMAKE_SYSROOT="${ANDROID_SYSROOT}" \ + -DCMAKE_FIND_ROOT_PATH="${ANDROID_SYSROOT}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ + -DCMAKE_SYSTEM_NAME=Generic \ + -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CC" \ + -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$CXX" \ + -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$LD" \ + -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AR" \ + -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin/$AS" \ + -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ + -DWEBRTC_ANDROID=1 \ + -DUNIX=1 \ + -DENABLE_STATIC=1 \ + -DENABLE_SHARED=0 \ + -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_system_processor) \ + "${BASEDIR}"/src/"${LIB_NAME}" || return 1 make -j$(get_cpu_count) || return 1 make install || return 1 # MANUALLY COPY PKG-CONFIG FILES -cp ./libilbc.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 +cp "${BUILD_DIR}"/libilbc.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 diff --git a/scripts/android/libwebp.sh b/scripts/android/libwebp.sh index 0df1311..73f6e3f 100755 --- a/scripts/android/libwebp.sh +++ b/scripts/android/libwebp.sh @@ -49,5 +49,6 @@ make install || return 1 cp ${BASEDIR}/src/${LIB_NAME}/src/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 cp ${BASEDIR}/src/${LIB_NAME}/src/demux/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 cp ${BASEDIR}/src/${LIB_NAME}/src/mux/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 +cp ${BASEDIR}/src/${LIB_NAME}/sharpyuv/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 make install || return 1 diff --git a/scripts/android/libxml2.sh b/scripts/android/libxml2.sh index 88ed05e..8989775 100755 --- a/scripts/android/libxml2.sh +++ b/scripts/android/libxml2.sh @@ -11,6 +11,8 @@ make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libxml2} -eq 1 ]]; then + ${SED_INLINE} 's|^AC_PREREQ|#AC_PREREQ|g' "${BASEDIR}"/src/"${LIB_NAME}"/configure.ac || return 1 + ${SED_INLINE} 's|AM_INIT_AUTOMAKE(\[[0-9.]* |AM_INIT_AUTOMAKE(\[|g' "${BASEDIR}"/src/"${LIB_NAME}"/configure.ac || return 1 autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 fi @@ -34,4 +36,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_libxml2_package_config "2.10.1" || return 1 +create_libxml2_package_config "2.11.4" || return 1 diff --git a/scripts/android/srt.sh b/scripts/android/srt.sh index fad3c47..f0b3f42 100644 --- a/scripts/android/srt.sh +++ b/scripts/android/srt.sh @@ -59,4 +59,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_srt_package_config "1.5.1" || return 1 \ No newline at end of file +create_srt_package_config "1.5.2" || return 1 \ No newline at end of file diff --git a/scripts/android/tesseract.sh b/scripts/android/tesseract.sh index a99ec0f..12a720f 100755 --- a/scripts/android/tesseract.sh +++ b/scripts/android/tesseract.sh @@ -1,15 +1,16 @@ #!/bin/bash # UPDATE BUILD FLAGS -export LEPTONICA_CFLAGS="-I${LIB_INSTALL_BASE}/leptonica/include/leptonica" -export LEPTONICA_LIBS="-L${LIB_INSTALL_BASE}/leptonica/lib -llept" +PKG_CONFIG_PATH=${INSTALL_PKG_CONFIG_DIR} +export LEPTONICA_CFLAGS=" $(pkg-config --cflags lept 2>>"${BASEDIR}"/build.log)" +export LEPTONICA_LIBS=" $(pkg-config --libs lept 2>>"${BASEDIR}"/build.log)" # ALWAYS CLEAN THE PREVIOUS BUILD make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then - autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 + ./autogen.sh 1>>"${BASEDIR}"/build.log 2>&1 || return 1 fi # WORKAROUND TO MANUALLY SET ENDIANNESS @@ -18,23 +19,21 @@ export ac_cv_c_bigendian=no ./configure \ --prefix="${LIB_INSTALL_PREFIX}" \ --with-pic \ - --with-sysroot="${ANDROID_SYSROOT}" \ + --without-tensorflow \ + --without-curl \ + --without-archive \ --enable-static \ --disable-shared \ --disable-fast-install \ --disable-debug \ --disable-graphics \ - --disable-cube \ + --disable-openmp \ --disable-tessdata-prefix \ - --disable-largefile \ --host="${HOST}" || return 1 -# WORKAROUND TO DISABLE LINKING TO rt -${SED_INLINE} 's/\-lrt//g' "${BASEDIR}"/src/"${LIB_NAME}"/api/Makefile || return 1 - make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_tesseract_package_config "3.05.02" || return 1 +create_tesseract_package_config "5.3.2" || return 1 diff --git a/scripts/android/zimg.sh b/scripts/android/zimg.sh index c340581..f782824 100644 --- a/scripts/android/zimg.sh +++ b/scripts/android/zimg.sh @@ -22,4 +22,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_zimg_package_config "3.0.4" || return 1 +create_zimg_package_config "3.0.5" || return 1 diff --git a/scripts/apple/fontconfig.sh b/scripts/apple/fontconfig.sh index 292207e..74fe79f 100755 --- a/scripts/apple/fontconfig.sh +++ b/scripts/apple/fontconfig.sh @@ -34,4 +34,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_fontconfig_package_config "2.14.0" || return 1 +create_fontconfig_package_config "2.14.2" || return 1 diff --git a/scripts/apple/freetype.sh b/scripts/apple/freetype.sh index c566449..131cb13 100755 --- 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 "24.3.18" || return 1 +create_freetype_package_config "25.0.19" || return 1 diff --git a/scripts/apple/giflib.sh b/scripts/apple/giflib.sh index 737f084..4c8b217 100755 --- a/scripts/apple/giflib.sh +++ b/scripts/apple/giflib.sh @@ -3,6 +3,9 @@ # UPDATE BUILD FLAGS export CFLAGS=$(get_cflags "${LIB_NAME}")" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR" +# COPY BUILD FILES +cp "${BASEDIR}"/tools/patch/make/giflib/* "${BASEDIR}"/src/"${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 + # ALWAYS CLEAN THE PREVIOUS BUILD make distclean 2>/dev/null 1>/dev/null @@ -25,4 +28,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_giflib_package_config "5.1.4" || return 1 +create_giflib_package_config "5.2.1" || return 1 diff --git a/scripts/apple/gmp.sh b/scripts/apple/gmp.sh index 7efaf91..faec3da 100755 --- a/scripts/apple/gmp.sh +++ b/scripts/apple/gmp.sh @@ -40,4 +40,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_gmp_package_config "6.2.0" || return 1 +create_gmp_package_config "6.2.1" || return 1 diff --git a/scripts/apple/gnutls.sh b/scripts/apple/gnutls.sh index 7a5a001..0b52395 100755 --- a/scripts/apple/gnutls.sh +++ b/scripts/apple/gnutls.sh @@ -1,5 +1,16 @@ #!/bin/bash +# INIT SUBMODULES +${SED_INLINE} 's|openssl/openssl|arthenica/openssl|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|tomato42|arthenica|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|warner|arthenica|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/libidn/gnulib-mirror|github.com/arthenica/gnulib|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/libtasn1|github.com/arthenica/libtasn1|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/nettle|github.com/arthenica/nettle|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/abi-dump|github.com/arthenica/abi-dump|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/gnutls/cligen|github.com/arthenica/cligen|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +${SED_INLINE} 's|gitlab.com/redhat-crypto/tests/interop|github.com/arthenica/redhat-crypto-tests-interop|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 + # UPDATE BUILD FLAGS export CFLAGS="$(get_cflags ${LIB_NAME}) -I${SDK_PATH}/usr/include" export CXXFLAGS=$(get_cxxflags "${LIB_NAME}") @@ -17,12 +28,11 @@ make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_gnutls} -eq 1 ]]; then - ./bootstrap || return 1 + ./bootstrap --skip-po || return 1 + git submodule update --remote gnulib || return 1 + overwrite_file ./gnulib/lib/fpending.c ./src/gl/fpending.c || return 1 fi -# MASKING THE -march=all OPTION WHICH BREAKS THE BUILD ON NEWER XCODE VERSIONS -${SED_INLINE} "s|AM_CCASFLAGS =|#AM_CCASFLAGS=|g" "${BASEDIR}"/src/"${LIB_NAME}"/lib/accelerated/aarch64/Makefile.in - ./configure \ --prefix="${LIB_INSTALL_PREFIX}" \ --with-pic \ @@ -52,7 +62,7 @@ make install || return 1 # CREATE PACKAGE CONFIG MANUALLY if [[ ${FFMPEG_KIT_BUILD_TYPE} == "macos" ]]; then - create_gnutls_package_config "3.6.15.1" "-framework Security" || return 1 + create_gnutls_package_config "3.7.9" "-framework Security" || return 1 else - create_gnutls_package_config "3.6.15.1" || return 1 + create_gnutls_package_config "3.7.9" || return 1 fi diff --git a/scripts/apple/libass.sh b/scripts/apple/libass.sh index 0a7daa2..c40df9e 100755 --- a/scripts/apple/libass.sh +++ b/scripts/apple/libass.sh @@ -3,7 +3,7 @@ # SET BUILD OPTIONS ASM_OPTIONS="--enable-asm" case ${ARCH} in -x86-64 | x86-64-mac-catalyst) +arm* | x86-64 | x86-64-mac-catalyst) ASM_OPTIONS="--disable-asm" ;; esac diff --git a/scripts/apple/libilbc.sh b/scripts/apple/libilbc.sh index ee1792d..d533951 100755 --- a/scripts/apple/libilbc.sh +++ b/scripts/apple/libilbc.sh @@ -1,25 +1,36 @@ #!/bin/bash -# ALWAYS CLEAN THE PREVIOUS BUILD -make distclean 2>/dev/null 1>/dev/null +# INIT SUBMODULES +${SED_INLINE} 's|/abseil/|/arthenica/|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +git submodule update --init || return 1 -# REGENERATE BUILD FILES IF NECESSARY OR REQUESTED -if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libilbc} -eq 1 ]]; then - autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 -fi +mkdir -p "${BUILD_DIR}" || return 1 +cd "${BUILD_DIR}" || return 1 -./configure \ - --prefix="${LIB_INSTALL_PREFIX}" \ - --with-pic \ - --with-sysroot="${SDK_PATH}" \ - --enable-static \ - --disable-shared \ - --disable-fast-install \ - --host="${HOST}" || return 1 +cmake -Wno-dev \ + -DCMAKE_VERBOSE_MAKEFILE=0 \ + -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ + -DCMAKE_ASM_FLAGS="${ASM_FLAGS}" \ + -DCMAKE_SYSROOT="${SDK_PATH}" \ + -DCMAKE_FIND_ROOT_PATH="${SDK_PATH}" \ + -DCMAKE_OSX_SYSROOT="$(get_sdk_name)" \ + -DCMAKE_OSX_ARCHITECTURES="$(get_cmake_osx_architectures)" \ + -DCMAKE_SYSTEM_NAME="Darwin" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ + -DCMAKE_C_COMPILER_ID="$CC" \ + -DCMAKE_CXX_COMPILER_ID="$CXX" \ + -DCMAKE_LINKER="$LD" \ + -DCMAKE_AR="$(xcrun --sdk $(get_sdk_name) -f ar)" \ + -DCMAKE_AS="$AS" \ + -DCMAKE_SYSTEM_PROCESSOR="$(get_target_cpu)" \ + -DBUILD_SHARED_LIBS=0 "${BASEDIR}"/src/"${LIB_NAME}" || return 1 make -j$(get_cpu_count) || return 1 make install || return 1 # MANUALLY COPY PKG-CONFIG FILES -cp ./libilbc.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 +cp "${BUILD_DIR}"/libilbc.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 diff --git a/scripts/apple/libpng.sh b/scripts/apple/libpng.sh index bf61984..2c36e66 100755 --- a/scripts/apple/libpng.sh +++ b/scripts/apple/libpng.sh @@ -41,4 +41,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_libpng_package_config "1.6.38" || return 1 +create_libpng_package_config "1.6.40" || return 1 diff --git a/scripts/apple/libwebp.sh b/scripts/apple/libwebp.sh index b5b9b1b..f513285 100755 --- a/scripts/apple/libwebp.sh +++ b/scripts/apple/libwebp.sh @@ -49,5 +49,6 @@ make install || return 1 cp ${BASEDIR}/src/${LIB_NAME}/src/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 cp ${BASEDIR}/src/${LIB_NAME}/src/demux/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 cp ${BASEDIR}/src/${LIB_NAME}/src/mux/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 +cp ${BASEDIR}/src/${LIB_NAME}/sharpyuv/*.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 make install || return 1 diff --git a/scripts/apple/libxml2.sh b/scripts/apple/libxml2.sh index 65f13fa..ddcd017 100755 --- a/scripts/apple/libxml2.sh +++ b/scripts/apple/libxml2.sh @@ -5,6 +5,8 @@ make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libxml2} -eq 1 ]]; then + ${SED_INLINE} 's|^AC_PREREQ|#AC_PREREQ|g' "${BASEDIR}"/src/"${LIB_NAME}"/configure.ac || return 1 + ${SED_INLINE} 's|AM_INIT_AUTOMAKE(\[[0-9.]* |AM_INIT_AUTOMAKE(\[|g' "${BASEDIR}"/src/"${LIB_NAME}"/configure.ac || return 1 autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 fi @@ -28,4 +30,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_libxml2_package_config "2.10.1" || return 1 +create_libxml2_package_config "2.11.4" || return 1 diff --git a/scripts/apple/tesseract.sh b/scripts/apple/tesseract.sh index 60f47b4..b1817af 100755 --- a/scripts/apple/tesseract.sh +++ b/scripts/apple/tesseract.sh @@ -1,29 +1,31 @@ #!/bin/bash # UPDATE BUILD FLAGS -export LEPTONICA_CFLAGS="-I${LIB_INSTALL_BASE}/leptonica/include/leptonica" -export LEPTONICA_LIBS="-L${LIB_INSTALL_BASE}/leptonica/lib -llept" +PKG_CONFIG_PATH=${INSTALL_PKG_CONFIG_DIR} +export LEPTONICA_CFLAGS=" $(pkg-config --cflags lept 2>>"${BASEDIR}"/build.log)" +export LEPTONICA_LIBS=" $(pkg-config --libs lept 2>>"${BASEDIR}"/build.log)" # ALWAYS CLEAN THE PREVIOUS BUILD make distclean 2>/dev/null 1>/dev/null # REGENERATE BUILD FILES IF NECESSARY OR REQUESTED if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then - autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 + ./autogen.sh 1>>"${BASEDIR}"/build.log 2>&1 || return 1 fi ./configure \ --prefix="${LIB_INSTALL_PREFIX}" \ --with-pic \ - --with-sysroot="${SDK_PATH}" \ + --without-tensorflow \ + --without-curl \ + --without-archive \ --enable-static \ --disable-shared \ --disable-fast-install \ --disable-debug \ --disable-graphics \ - --disable-cube \ + --disable-openmp \ --disable-tessdata-prefix \ - --disable-largefile \ --host="${HOST}" || return 1 # WORKAROUNDS @@ -34,12 +36,9 @@ if [[ ${FFMPEG_KIT_BUILD_TYPE} != "macos" ]]; then ${SED_INLINE} 's/$wl-bind_at_load//g' ${BASEDIR}/src/${LIB_NAME}/libtool fi -# WORKAROUND TO DISABLE LINKING TO rt -${SED_INLINE} 's/-lrt//g' ${BASEDIR}/src/${LIB_NAME}/api/Makefile - make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_tesseract_package_config "3.05.02" || return 1 +create_tesseract_package_config "5.3.2" || return 1 diff --git a/scripts/function-android.sh b/scripts/function-android.sh index 99b619c..36415b4 100755 --- a/scripts/function-android.sh +++ b/scripts/function-android.sh @@ -317,6 +317,9 @@ get_app_specific_cflags() { ffmpeg) APP_FLAGS="-Wno-unused-function -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD" ;; + gnutls) + APP_FLAGS="-std=c99 -Wno-unused-function -D_GL_USE_STDLIB_ALLOC=1" + ;; kvazaar) APP_FLAGS="-std=gnu99 -Wno-unused-function" ;; @@ -384,7 +387,7 @@ get_cxxflags() { x265) echo "-std=c++11 -fno-exceptions ${OPTIMIZATION_FLAGS}" ;; - rubberband | srt | zimg) + rubberband | srt | tesseract | zimg) echo "-std=c++11 ${OPTIMIZATION_FLAGS}" ;; *) diff --git a/scripts/function-apple.sh b/scripts/function-apple.sh index bef5351..a45b8b9 100755 --- a/scripts/function-apple.sh +++ b/scripts/function-apple.sh @@ -1448,7 +1448,7 @@ URL: https://github.com/tesseract-ocr/tesseract Version: ${TESSERACT_VERSION} Requires: lept -Libs: -L\${libdir} -ltesseract +Libs: -L\${libdir} -ltesseract -framework Accelerate Cflags: -I\${includedir} EOF } diff --git a/scripts/function-ios.sh b/scripts/function-ios.sh index 02ae7c3..8dcf328 100755 --- a/scripts/function-ios.sh +++ b/scripts/function-ios.sh @@ -208,6 +208,9 @@ get_app_specific_cflags() { ffmpeg-kit) APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc" ;; + gnutls) + APP_FLAGS="-std=c99 -Wno-unused-function -D_GL_USE_STDLIB_ALLOC=1" + ;; jpeg) APP_FLAGS="-Wno-nullability-completeness" ;; @@ -221,7 +224,7 @@ get_app_specific_cflags() { APP_FLAGS="-fno-common -DPIC" ;; sdl) - APP_FLAGS="-DPIC -Wno-unused-function -D__IPHONEOS__" + APP_FLAGS="-DPIC -Wno-declaration-after-statement -Wno-unused-function -D__IPHONEOS__" ;; shine) APP_FLAGS="-Wno-unused-function" @@ -294,19 +297,22 @@ get_cxxflags() { gnutls) echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; - libwebp | xvidcore) - echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" - ;; libaom) echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; + libilbc) + echo "-std=c++14 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" + ;; + libwebp | xvidcore) + echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" + ;; opencore-amr) echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; rubberband) echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; - srt | zimg) + srt | tesseract | zimg) echo "-std=c++11 ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; *) @@ -437,7 +443,7 @@ set_toolchain_paths() { LOCAL_ASMFLAGS="$(get_asmflags $1)" case ${ARCH} in armv7*) - if [ "$1" == "x265" ]; then + if [ "$1" == "x265" ] || [ "$1" == "libilbc" ]; then export AS="${LOCAL_GAS_PREPROCESSOR}" export AS_ARGUMENTS="-arch arm" export ASM_FLAGS="${LOCAL_ASMFLAGS}" @@ -446,7 +452,7 @@ set_toolchain_paths() { fi ;; arm64*) - if [ "$1" == "x265" ]; then + if [ "$1" == "x265" ] || [ "$1" == "libilbc" ]; then export AS="${LOCAL_GAS_PREPROCESSOR}" export AS_ARGUMENTS="-arch aarch64" export ASM_FLAGS="${LOCAL_ASMFLAGS}" diff --git a/scripts/function-linux.sh b/scripts/function-linux.sh index faedc08..34b5441 100755 --- a/scripts/function-linux.sh +++ b/scripts/function-linux.sh @@ -335,7 +335,7 @@ get_cxxflags() { ffmpeg-kit) echo "${COMMON_FLAGS}" ;; - srt | zimg) + srt | tesseract | zimg) echo "${COMMON_FLAGS} -fcxx-exceptions -fPIC" ;; *) diff --git a/scripts/function-macos.sh b/scripts/function-macos.sh index 1137e43..acc752d 100755 --- a/scripts/function-macos.sh +++ b/scripts/function-macos.sh @@ -151,6 +151,9 @@ get_app_specific_cflags() { ffmpeg-kit) APP_FLAGS="-std=c99 -Wno-unused-function -Wall -Wno-deprecated-declarations -Wno-pointer-sign -Wno-switch -Wno-unused-result -Wno-unused-variable -DPIC -fobjc-arc" ;; + gnutls) + APP_FLAGS="-std=c99 -Wno-unused-function -D_GL_USE_STDLIB_ALLOC=1" + ;; jpeg) APP_FLAGS="-Wno-nullability-completeness" ;; @@ -230,19 +233,22 @@ get_cxxflags() { gnutls) echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; - libwebp | xvidcore) - echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" - ;; libaom) echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; + libilbc) + echo "-std=c++14 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" + ;; + libwebp | xvidcore) + echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" + ;; opencore-amr) echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; rubberband) echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; - srt | zimg) + srt | tesseract | zimg) echo "-std=c++11 ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; *) @@ -338,7 +344,7 @@ set_toolchain_paths() { LOCAL_ASMFLAGS="$(get_asmflags $1)" case ${ARCH} in arm64) - if [ "$1" == "x265" ]; then + if [ "$1" == "x265" ] || [ "$1" == "libilbc" ]; then export AS="${LOCAL_GAS_PREPROCESSOR}" export AS_ARGUMENTS="-arch aarch64" export ASM_FLAGS="${LOCAL_ASMFLAGS}" diff --git a/scripts/function-tvos.sh b/scripts/function-tvos.sh index f36f0f6..b1a608e 100755 --- a/scripts/function-tvos.sh +++ b/scripts/function-tvos.sh @@ -181,6 +181,9 @@ get_app_specific_cflags() { ffmpeg) APP_FLAGS="-Wno-unused-function -Wno-deprecated-declarations" ;; + gnutls) + APP_FLAGS="-std=c99 -Wno-unused-function -D_GL_USE_STDLIB_ALLOC=1" + ;; jpeg) APP_FLAGS="-Wno-nullability-completeness" ;; @@ -270,19 +273,22 @@ get_cxxflags() { gnutls) echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; - libwebp | xvidcore) - echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" - ;; libaom) echo "-std=c++11 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; + libilbc) + echo "-std=c++14 -fno-exceptions ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" + ;; + libwebp | xvidcore) + echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} -fno-common -DPIC ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" + ;; opencore-amr) echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; rubberband) echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; - srt | zimg) + srt | tesseract | zimg) echo "-std=c++11 ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}" ;; *) @@ -401,7 +407,7 @@ set_toolchain_paths() { LOCAL_ASMFLAGS="$(get_asmflags "$1")" case ${ARCH} in arm64*) - if [ "$1" == "x265" ]; then + if [ "$1" == "x265" ] || [ "$1" == "libilbc" ]; then export AS="${LOCAL_GAS_PREPROCESSOR}" export AS_ARGUMENTS="-arch aarch64" export ASM_FLAGS="${LOCAL_ASMFLAGS}" diff --git a/scripts/linux/libaom.sh b/scripts/linux/libaom.sh index d4a23bf..25d445d 100755 --- a/scripts/linux/libaom.sh +++ b/scripts/linux/libaom.sh @@ -42,4 +42,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_libaom_package_config "3.5.0" || return 1 +create_libaom_package_config "3.6.1" || return 1 diff --git a/scripts/linux/libilbc.sh b/scripts/linux/libilbc.sh index beeaa91..42ae293 100755 --- a/scripts/linux/libilbc.sh +++ b/scripts/linux/libilbc.sh @@ -1,24 +1,35 @@ #!/bin/bash -# ALWAYS CLEAN THE PREVIOUS BUILD -make distclean 2>/dev/null 1>/dev/null +# INIT SUBMODULES +${SED_INLINE} 's|/abseil/|/arthenica/|g' "${BASEDIR}"/src/"${LIB_NAME}"/.gitmodules || return 1 +git submodule update --init || return 1 -# REGENERATE BUILD FILES IF NECESSARY OR REQUESTED -if [[ ! -f "${BASEDIR}"/src/"${LIB_NAME}"/configure ]] || [[ ${RECONF_libilbc} -eq 1 ]]; then - autoreconf_library "${LIB_NAME}" 1>>"${BASEDIR}"/build.log 2>&1 || return 1 -fi +mkdir -p "${BUILD_DIR}" || return 1 +cd "${BUILD_DIR}" || return 1 -./configure \ - --prefix="${LIB_INSTALL_PREFIX}" \ - --with-pic \ - --enable-static \ - --disable-shared \ - --disable-fast-install \ - --host="${HOST}" || return 1 +cmake -Wno-dev \ + -DCMAKE_VERBOSE_MAKEFILE=0 \ + -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_INSTALL_PREFIX="${LIB_INSTALL_PREFIX}" \ + -DCMAKE_CXX_COMPILER="$CXX" \ + -DCMAKE_C_COMPILER="$CC" \ + -DCMAKE_LINKER="$LD" \ + -DCMAKE_AR="$AR" \ + -DCMAKE_AS="$AS" \ + -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_system_processor) \ + -DCMAKE_POSITION_INDEPENDENT_CODE=1 \ + -DUNIX=1 \ + -DENABLE_STATIC=1 \ + -DENABLE_SHARED=0 \ + "${BASEDIR}"/src/"${LIB_NAME}" || return 1 make -j$(get_cpu_count) || return 1 make install || return 1 # MANUALLY COPY PKG-CONFIG FILES -cp ./libilbc.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 +cp "${BUILD_DIR}"/libilbc.pc "${INSTALL_PKG_CONFIG_DIR}" || return 1 diff --git a/scripts/linux/srt.sh b/scripts/linux/srt.sh index f4a5084..488be97 100755 --- a/scripts/linux/srt.sh +++ b/scripts/linux/srt.sh @@ -46,4 +46,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_srt_package_config "1.5.1" || return 1 \ No newline at end of file +create_srt_package_config "1.5.2" || return 1 \ No newline at end of file diff --git a/scripts/linux/zimg.sh b/scripts/linux/zimg.sh index c95d347..cf97fc3 100755 --- a/scripts/linux/zimg.sh +++ b/scripts/linux/zimg.sh @@ -21,4 +21,4 @@ make -j$(get_cpu_count) || return 1 make install || return 1 # CREATE PACKAGE CONFIG MANUALLY -create_zimg_package_config "3.0.4" || return 1 +create_zimg_package_config "3.0.5" || return 1 diff --git a/scripts/source.sh b/scripts/source.sh index 84b8090..cbc4ab5 100755 --- a/scripts/source.sh +++ b/scripts/source.sh @@ -18,17 +18,17 @@ get_library_source() { ;; cpu-features) SOURCE_REPO_URL="https://github.com/arthenica/cpu_features" - SOURCE_ID="v0.7.0" + SOURCE_ID="v0.8.0" SOURCE_TYPE="TAG" ;; dav1d) SOURCE_REPO_URL="https://github.com/arthenica/dav1d" - SOURCE_ID="1.0.0" + SOURCE_ID="1.2.1" SOURCE_TYPE="TAG" ;; expat) SOURCE_REPO_URL="https://github.com/arthenica/libexpat" - SOURCE_ID="R_2_4_8" + SOURCE_ID="R_2_5_0" SOURCE_TYPE="TAG" ;; ffmpeg) @@ -38,47 +38,47 @@ get_library_source() { ;; fontconfig) SOURCE_REPO_URL="https://github.com/arthenica/fontconfig" - SOURCE_ID="2.14.0" + SOURCE_ID="2.14.2" SOURCE_TYPE="TAG" ;; freetype) SOURCE_REPO_URL="https://github.com/arthenica/freetype2" - SOURCE_ID="VER-2-12-1" + SOURCE_ID="VER-2-13-0" SOURCE_TYPE="TAG" ;; fribidi) SOURCE_REPO_URL="https://github.com/arthenica/fribidi" - SOURCE_ID="v1.0.12" + SOURCE_ID="v1.0.13" SOURCE_TYPE="TAG" ;; giflib) SOURCE_REPO_URL="https://github.com/arthenica/giflib" - SOURCE_ID="5.1.4" + SOURCE_ID="5.2.1" SOURCE_TYPE="TAG" ;; gmp) SOURCE_REPO_URL="https://github.com/arthenica/gmp" - SOURCE_ID="v6.2.0" + SOURCE_ID="v6.2.1" SOURCE_TYPE="TAG" ;; gnutls) SOURCE_REPO_URL="https://github.com/arthenica/gnutls" - SOURCE_ID="3.6.15.1" + SOURCE_ID="3.7.9" SOURCE_TYPE="TAG" ;; harfbuzz) SOURCE_REPO_URL="https://github.com/arthenica/harfbuzz" - SOURCE_ID="5.2.0" + SOURCE_ID="8.0.1" SOURCE_TYPE="TAG" ;; jpeg) SOURCE_REPO_URL="https://github.com/arthenica/libjpeg-turbo" - SOURCE_ID="2.1.4" + SOURCE_ID="3.0.0" SOURCE_TYPE="TAG" ;; kvazaar) SOURCE_REPO_URL="https://github.com/arthenica/kvazaar" - SOURCE_ID="v2.1.0" + SOURCE_ID="v2.2.0" SOURCE_TYPE="TAG" ;; lame) @@ -88,27 +88,27 @@ get_library_source() { ;; leptonica) SOURCE_REPO_URL="https://github.com/arthenica/leptonica" - SOURCE_ID="1.78.0" + SOURCE_ID="1.83.1" SOURCE_TYPE="TAG" ;; libaom) SOURCE_REPO_URL="https://github.com/arthenica/libaom" - SOURCE_ID="v3.5.0" + SOURCE_ID="v3.6.1" SOURCE_TYPE="TAG" ;; libass) SOURCE_REPO_URL="https://github.com/arthenica/libass" - SOURCE_ID="0.15.2" + SOURCE_ID="0.17.1" SOURCE_TYPE="TAG" ;; libiconv) SOURCE_REPO_URL="https://github.com/arthenica/libiconv" - SOURCE_ID="v1.16.2" + SOURCE_ID="v1.17" SOURCE_TYPE="TAG" ;; libilbc) SOURCE_REPO_URL="https://github.com/arthenica/libilbc" - SOURCE_ID="v2.0.2" + SOURCE_ID="v3.0.4" SOURCE_TYPE="TAG" ;; libogg) @@ -118,7 +118,7 @@ get_library_source() { ;; libpng) SOURCE_REPO_URL="https://github.com/arthenica/libpng" - SOURCE_ID="v1.6.38" + SOURCE_ID="v1.6.40" SOURCE_TYPE="TAG" ;; libsamplerate) @@ -128,7 +128,7 @@ get_library_source() { ;; libsndfile) SOURCE_REPO_URL="https://github.com/arthenica/libsndfile" - SOURCE_ID="1.0.31" + SOURCE_ID="1.2.0" SOURCE_TYPE="TAG" ;; libtheora) @@ -143,7 +143,7 @@ get_library_source() { ;; libvidstab) SOURCE_REPO_URL="https://github.com/arthenica/vid.stab" - SOURCE_ID="v1.1.0" + SOURCE_ID="v1.1.1" SOURCE_TYPE="TAG" ;; libvorbis) @@ -153,17 +153,17 @@ get_library_source() { ;; libvpx) SOURCE_REPO_URL="https://github.com/arthenica/libvpx" - SOURCE_ID="v1.12.0" + SOURCE_ID="v1.13.0" SOURCE_TYPE="TAG" ;; libwebp) SOURCE_REPO_URL="https://github.com/arthenica/libwebp" - SOURCE_ID="v1.2.4" + SOURCE_ID="v1.3.1" SOURCE_TYPE="TAG" ;; libxml2) SOURCE_REPO_URL="https://github.com/arthenica/libxml2" - SOURCE_ID="v2.10.1" + SOURCE_ID="v2.11.4" SOURCE_TYPE="TAG" ;; nettle) @@ -183,12 +183,12 @@ get_library_source() { ;; openssl) SOURCE_REPO_URL="https://github.com/arthenica/openssl" - SOURCE_ID="openssl-3.0.5" + SOURCE_ID="openssl-3.1.1" SOURCE_TYPE="TAG" ;; opus) SOURCE_REPO_URL="https://github.com/arthenica/opus" - SOURCE_ID="v1.3.1" + SOURCE_ID="v1.4" SOURCE_TYPE="TAG" ;; rubberband) @@ -223,12 +223,12 @@ get_library_source() { ;; srt) SOURCE_REPO_URL="https://github.com/arthenica/srt" - SOURCE_ID="v1.5.1" + SOURCE_ID="v1.5.2" SOURCE_TYPE="TAG" ;; tesseract) SOURCE_REPO_URL="https://github.com/arthenica/tesseract" - SOURCE_ID="3.05.02" + SOURCE_ID="5.3.2" SOURCE_TYPE="TAG" ;; tiff) @@ -248,7 +248,7 @@ get_library_source() { ;; x264) SOURCE_REPO_URL="https://github.com/arthenica/x264" - SOURCE_ID="7628a5696f79a1f0421dda99ab37b34481c69821" + SOURCE_ID="eaa68fad9e5d201d42fde51665f2d137ae96baf0" SOURCE_TYPE="COMMIT" ;; x265) @@ -263,7 +263,7 @@ get_library_source() { ;; zimg) SOURCE_REPO_URL="https://github.com/arthenica/zimg" - SOURCE_ID="release-3.0.4" + SOURCE_ID="release-3.0.5" SOURCE_TYPE="TAG" ;; esac diff --git a/tools/patch/make/giflib/Makefile.am b/tools/patch/make/giflib/Makefile.am new file mode 100644 index 0000000..cae5174 --- /dev/null +++ b/tools/patch/make/giflib/Makefile.am @@ -0,0 +1,10 @@ +lib_LTLIBRARIES = libgif.la + +libgif_la_SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c gif_hash.c openbsd-reallocarray.c quantize.c + +include_HEADERS = gif_lib.h + +libgif_la_CFLAGS = $(CFLAGS) +libgif_la_OBJCFLAGS = $(CFLAGS) +libgif_la_CXXFLAGS = $(CXXFLAGS) +libgif_la_LDFLAGS = $(LDFLAGS) diff --git a/tools/patch/make/giflib/configure.ac b/tools/patch/make/giflib/configure.ac new file mode 100644 index 0000000..c441b4c --- /dev/null +++ b/tools/patch/make/giflib/configure.ac @@ -0,0 +1,48 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT(giflib, [5.2.1], [esr@thyrsus.com], giflib) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_SRCDIR([dgif_lib.c]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) +dnl Make builds less verbose. Shuts off Makefile portability checks. +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl Note: config.h is not used in the current build +dnl We leave this in place only to suppress an error message at autogen time +AC_CONFIG_HEADERS([config.h]) + +dnl Checks for programs. +AM_PROG_AR +AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AM_PROG_CC_C_O + +LT_INIT + +dnl Allow partial building on systems without xmlto +AC_CHECK_PROG([have_xmlto], [xmlto], ["yes"],["no"]) +AM_CONDITIONAL([BUILD_DOC], [test "x${have_xmlto}" = "xyes"]) + +dnl Shared-library version +SHLIBVERSION=7:0:0 +AC_SUBST(SHLIBVERSION) + +dnl Define warnings if we're compiling with gcc. +dnl Set it in CFLAGS so the end-user can disable it if they wish. +if test "x$GCC" = "xyes" ; then + CFLAGS="$CFLAGS -Wall" +fi + +AC_CHECK_HEADERS(limits.h, , + AC_MSG_ERROR([giflib needs limits.h to compile])) +AC_CHECK_HEADERS(fcntl.h, , + AC_MSG_ERROR([giflib needs fcntl.h to compile])) +AC_CHECK_HEADERS(stdint.h, , + AC_MSG_ERROR([giflib needs stdint.h to compile])) +AC_CHECK_HEADERS(stdarg.h, , + AC_MSG_ERROR([giflib needs stdarg.h to compile])) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/tools/patch/make/sdl/configure.in b/tools/patch/make/sdl/configure.in index 01771fa..b67c21b 100644 --- a/tools/patch/make/sdl/configure.in +++ b/tools/patch/make/sdl/configure.in @@ -3327,7 +3327,6 @@ case "$host" in ;; esac CheckVisibilityHidden - CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3495,7 +3494,6 @@ case "$host" in ac_default_prefix=$BUILD_PREFIX fi fi - CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3677,7 +3675,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ARCH=ios CheckVisibilityHidden - CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3786,7 +3783,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX" CheckVisibilityHidden - CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio @@ -3892,7 +3888,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau fi CheckVisibilityHidden - CheckDeclarationAfterStatement CheckDummyVideo CheckDiskAudio CheckDummyAudio