add create xcframework bundles option to ios.sh, fixes #351

fix parsing of unicode parameters on ios/tvos, fixes #360
update rubber band build flags
2020-03-29 18:56:24 +01:00 · 2020-03-09 20:30:25 +00:00 · 2020-03-02 23:23:26 +00:00 · 2020-03-01 20:05:10 +00:00 · 2020-02-29 00:41:17 +00:00 · 2020-02-28 23:17:20 +00:00
236 changed files with 438717 additions and 3249 deletions
@@ -2,36 +2,32 @@ branches:
  only:
  - master
  - development
-sudo: false
 git:
  quiet: true
-addons:
-  apt:
-    packages:
-      - autoconf
-      - automake
-      - libtool
-      - pkg-config
-      - curl
-      - git
-      - cmake
-      - gcc
-      - gperf
-      - texinfo
-      - yasm
-      - nasm
-      - bison
-      - autogen
-      - patch
-  homebrew:
-    packages:
-      - nasm
-    update: true
-matrix:
+jobs:
  include:
    - name: "Android Main Build"
      language: android
+      os: linux
      dist : trusty
+      addons:
+        apt:
+          packages:
+            - autoconf
+            - automake
+            - libtool
+            - pkg-config
+            - curl
+            - git
+            - cmake
+            - gcc
+            - gperf
+            - texinfo
+            - yasm
+            - nasm
+            - bison
+            - autogen
+            - patch
      android:
        components:
          - tools
@@ -59,7 +55,26 @@ matrix:
        - bash ./android.sh --no-output-redirection
    - name: "Android LTS Build"
      language: android
+      os: linux
      dist : trusty
+      addons:
+        apt:
+          packages:
+            - autoconf
+            - automake
+            - libtool
+            - pkg-config
+            - curl
+            - git
+            - cmake
+            - gcc
+            - gperf
+            - texinfo
+            - yasm
+            - nasm
+            - bison
+            - autogen
+            - patch
      android:
        components:
          - tools
@@ -88,7 +103,13 @@ matrix:
        - bash ./android.sh --lts --no-output-redirection
    - name: "iOS Main Build"
      language: objective-c
+      os: osx
      osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
      before_script:
        - rm -f ./build.log
      after_success:
@@ -101,6 +122,12 @@ matrix:
    - name: "iOS LTS Build"
      language: objective-c
      osx_image: xcode7.3
+      os: osx
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
      before_script:
        - rm -f ./build.log
      after_success:
@@ -112,7 +139,13 @@ matrix:
        - bash ./ios.sh --lts --no-output-redirection
    - name: "tvOS Main Build"
      language: objective-c
+      os: osx
      osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
      before_script:
        - rm -f ./build.log
      after_success:
@@ -124,7 +157,13 @@ matrix:
        - bash ./tvos.sh --no-output-redirection
    - name: "tvOS LTS Build"
      language: objective-c
+      os: osx
      osx_image: xcode7.3
+      addons:
+        homebrew:
+          packages:
+            - nasm
+          update: true
      before_script:
        - rm -f ./build.log
      after_success:
@@ -36,8 +36,8 @@ FFmpeg for Android, iOS and tvOS
 - Supports `API Level 16+`

 #### 1.2 iOS
- Builds `armv7`, `armv7s`, `arm64`, `arm64e`, `i386` and `x86_64` architectures
- Supports `bzip2`, `zlib`, `iconv` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` system frameworks
+- Builds `armv7`, `armv7s`, `arm64`, `arm64e`, `i386`, `x86_64` and `x86_64` (Mac Catalyst) architectures
+- Supports `bzip2`, `iconv`, `libuuid`, `zlib` system libraries and `AudioToolbox`, `CoreImage`, `VideoToolbox`, `AVFoundation` system frameworks
 - Objective-C API
 - Camera access
 - `ARC` enabled library
@@ -85,7 +85,7 @@ public class Config {
        /* LOAD NOT-LOADED LIBRARIES ON API < 21 */
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
            final List<String> externalLibrariesEnabled = getExternalLibraries();
-            if (externalLibrariesEnabled.contains("tesseract") || externalLibrariesEnabled.contains("x265") || externalLibrariesEnabled.contains("snappy") || externalLibrariesEnabled.contains("openh264")) {
+            if (externalLibrariesEnabled.contains("tesseract") || externalLibrariesEnabled.contains("x265") || externalLibrariesEnabled.contains("snappy") || externalLibrariesEnabled.contains("openh264") || externalLibrariesEnabled.contains("rubberband")) {
                // libc++_shared.so included only when tesseract or x265 is enabled
                System.loadLibrary("c++_shared");
            }
@@ -54,6 +54,7 @@ class Packages {
        supportedExternalLibraries.add("opencore-amr");
        supportedExternalLibraries.add("openh264");
        supportedExternalLibraries.add("opus");
+        supportedExternalLibraries.add("rubberband");
        supportedExternalLibraries.add("sdl2");
        supportedExternalLibraries.add("shine");
        supportedExternalLibraries.add("snappy");
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="chromaprint"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -40,28 +40,30 @@ get_library_name() {
        19) echo "xvidcore" ;;
        20) echo "x265" ;;
        21) echo "libvidstab" ;;
-        22) echo "libilbc" ;;
-        23) echo "opus" ;;
-        24) echo "snappy" ;;
-        25) echo "soxr" ;;
-        26) echo "libaom" ;;
-        27) echo "chromaprint" ;;
-        28) echo "twolame" ;;
-        29) echo "sdl" ;;
-        30) echo "tesseract" ;;
-        31) echo "openh264" ;;
-        32) echo "giflib" ;;
-        33) echo "jpeg" ;;
-        34) echo "libogg" ;;
-        35) echo "libpng" ;;
-        36) echo "libuuid" ;;
-        37) echo "nettle" ;;
-        38) echo "tiff" ;;
-        39) echo "expat" ;;
-        40) echo "libsndfile" ;;
-        41) echo "leptonica" ;;
-        42) echo "android-zlib" ;;
-        43) echo "android-media-codec" ;;
+        22) echo "rubberband" ;;
+        23) echo "libilbc" ;;
+        24) echo "opus" ;;
+        25) echo "snappy" ;;
+        26) echo "soxr" ;;
+        27) echo "libaom" ;;
+        28) echo "chromaprint" ;;
+        29) echo "twolame" ;;
+        30) echo "sdl" ;;
+        31) echo "tesseract" ;;
+        32) echo "openh264" ;;
+        33) echo "giflib" ;;
+        34) echo "jpeg" ;;
+        35) echo "libogg" ;;
+        36) echo "libpng" ;;
+        37) echo "libuuid" ;;
+        38) echo "nettle" ;;
+        39) echo "tiff" ;;
+        40) echo "expat" ;;
+        41) echo "libsndfile" ;;
+        42) echo "leptonica" ;;
+        43) echo "libsamplerate" ;;
+        44) echo "android-zlib" ;;
+        45) echo "android-media-codec" ;;
    esac
 }

@@ -75,7 +77,7 @@ get_arch_name() {
    esac
 }

-get_target_host() {
+get_build_host() {
    case ${ARCH} in
        arm-v7a | arm-v7a-neon)
            echo "arm-linux-androideabi"
@@ -282,7 +284,6 @@ get_size_optimization_cflags() {
 }

 get_app_specific_cflags() {
-
    local APP_FLAGS=""
    case $1 in
        xvidcore)
@@ -291,15 +292,18 @@ get_app_specific_cflags() {
        ffmpeg)
            APP_FLAGS="-Wno-unused-function -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD"
        ;;
+        kvazaar)
+            APP_FLAGS="-std=gnu99 -Wno-unused-function"
+        ;;
+        rubberband)
+            APP_FLAGS="-std=c99 -Wno-unused-function"
+        ;;
        shine)
            APP_FLAGS="-Wno-unused-function"
        ;;
        soxr | snappy | libwebp)
            APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
        ;;
-        kvazaar)
-            APP_FLAGS="-std=gnu99 -Wno-unused-function"
-        ;;
        *)
            APP_FLAGS="-std=c99 -Wno-unused-function"
        ;;
@@ -352,6 +356,9 @@ get_cxxflags() {
        x265)
            echo "-std=c++11 -fno-exceptions ${OPTIMIZATION_FLAGS}"
        ;;
+        rubberband)
+            echo "-std=c++11 ${OPTIMIZATION_FLAGS}"
+        ;;
        *)
            echo "-std=c++11 -fno-exceptions -fno-rtti ${OPTIMIZATION_FLAGS}"
        ;;
@@ -359,7 +366,7 @@ get_cxxflags() {
 }

 get_common_linked_libraries() {
-    local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${TARGET_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${TARGET_HOST}/${API} -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib"
+    local COMMON_LIBRARY_PATHS="-L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/${BUILD_HOST}/lib -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/lib/${BUILD_HOST}/${API} -L${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/lib"

    case $1 in
        ffmpeg)
@@ -831,7 +838,7 @@ Cflags: -I\${includedir}
 EOF
 }

-create_zlib_package_config() {
+create_zlib_system_package_config() {
    ZLIB_VERSION=$(grep '#define ZLIB_VERSION' ${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g')

    cat > "${INSTALL_PKG_CONFIG_DIR}/zlib.pc" << EOF
@@ -930,6 +937,12 @@ download_gpl_library_source() {
            GPL_LIB_ORIG_DIR="xvidcore"
            GPL_LIB_DEST_DIR="xvidcore"
        ;;
+        rubberband)
+            GPL_LIB_URL="https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2"
+            GPL_LIB_FILE="rubberband-1.8.2.tar.bz2"
+            GPL_LIB_ORIG_DIR="rubberband-1.8.2"
+            GPL_LIB_DEST_DIR="rubberband"
+        ;;
    esac

    local GPL_LIB_SOURCE_PATH="${BASEDIR}/src/${GPL_LIB_DEST_DIR}"
@@ -1003,16 +1016,16 @@ download_gpl_library_source() {
 set_toolchain_clang_paths() {
    export PATH=$PATH:${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/bin

-    TARGET_HOST=$(get_target_host)
+    BUILD_HOST=$(get_build_host)
    
-    export AR=${TARGET_HOST}-ar
+    export AR=${BUILD_HOST}-ar
    export CC=$(get_clang_target_host)-clang
    export CXX=$(get_clang_target_host)-clang++

    if [ "$1" == "x264" ]; then
        export AS=${CC}
    else
-        export AS=${TARGET_HOST}-as
+        export AS=${BUILD_HOST}-as
    fi

    case ${ARCH} in
@@ -1021,9 +1034,9 @@ set_toolchain_clang_paths() {
        ;;
    esac

-    export LD=${TARGET_HOST}-ld
-    export RANLIB=${TARGET_HOST}-ranlib
-    export STRIP=${TARGET_HOST}-strip
+    export LD=${BUILD_HOST}-ld
+    export RANLIB=${BUILD_HOST}-ranlib
+    export STRIP=${BUILD_HOST}-strip

    export INSTALL_PKG_CONFIG_DIR="${BASEDIR}/prebuilt/android-$(get_target_build)/pkgconfig"
    export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"
@@ -1033,7 +1046,7 @@ set_toolchain_clang_paths() {
    fi

    if [ ! -f ${ZLIB_PACKAGE_CONFIG_PATH} ]; then
-        create_zlib_package_config
+        create_zlib_system_package_config
    fi

    prepare_inline_sed
@@ -1050,14 +1063,14 @@ build_cpufeatures() {

    set_toolchain_clang_paths "cpu-features"

-    TARGET_HOST=$(get_target_host)
+    BUILD_HOST=$(get_build_host)
    export CFLAGS=$(get_cflags "cpu-features")
    export CXXFLAGS=$(get_cxxflags "cpu-features")
    export LDFLAGS=$(get_ldflags "cpu-features")

    # THEN BUILD FOR THIS ABI
    $(get_clang_target_host)-clang -c ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.c -o ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
-    ${TARGET_HOST}-ar rcs ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.a ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
+    ${BUILD_HOST}-ar rcs ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.a ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o 1>>${BASEDIR}/build.log 2>&1
    $(get_clang_target_host)-clang -shared ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/cpu-features.o -o ${ANDROID_NDK_ROOT}/sources/android/cpufeatures/libcpufeatures.so 1>>${BASEDIR}/build.log 2>&1

    create_cpufeatures_package_config
@@ -1076,13 +1089,13 @@ build_android_lts_support() {
    set_toolchain_clang_paths ${LIB_NAME}

    # PREPARING FLAGS
-    TARGET_HOST=$(get_target_host)
+    BUILD_HOST=$(get_build_host)
    CFLAGS=$(get_cflags ${LIB_NAME})
    LDFLAGS=$(get_ldflags ${LIB_NAME})

    # THEN BUILD FOR THIS ABI
    $(get_clang_target_host)-clang ${CFLAGS} -Wno-unused-command-line-argument -c ${BASEDIR}/android/app/src/main/cpp/android_lts_support.c -o ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o ${LDFLAGS} 1>>${BASEDIR}/build.log 2>&1
-    ${TARGET_HOST}-ar rcs ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o 1>>${BASEDIR}/build.log 2>&1
+    ${BUILD_HOST}-ar rcs ${BASEDIR}/android/app/src/main/cpp/libandroidltssupport.a ${BASEDIR}/android/app/src/main/cpp/android_lts_support.o 1>>${BASEDIR}/build.log 2>&1
 }

 autoreconf_library() {
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="expat"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_expat} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -51,7 +51,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -29,12 +29,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="ffmpeg"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -76,7 +76,7 @@ esac
 CONFIGURE_POSTFIX=""
 HIGH_PRIORITY_INCLUDES=""

-for library in {1..44}
+for library in {1..46}
 do
    if [[ ${!library} -eq 1 ]]; then
        ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -194,6 +194,11 @@ do
                LDFLAGS+=" $(pkg-config --libs --static opus)"
                CONFIGURE_POSTFIX+=" --enable-libopus"
            ;;
+            rubberband)
+                CFLAGS+=" $(pkg-config --cflags rubberband)"
+                LDFLAGS+=" $(pkg-config --libs --static rubberband)"
+                CONFIGURE_POSTFIX+=" --enable-librubberband --enable-gpl"
+            ;;
            shine)
                CFLAGS+=" $(pkg-config --cflags shine)"
                LDFLAGS+=" $(pkg-config --libs --static shine)"
@@ -285,9 +290,9 @@ do
    else

        # THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
-        if [[ ${library} -eq 30 ]]; then
+        if [[ ${library} -eq 31 ]]; then
            CONFIGURE_POSTFIX+=" --disable-sdl2"
-        elif [[ ${library} -eq 43 ]]; then
+        elif [[ ${library} -eq 45 ]]; then
            CONFIGURE_POSTFIX+=" --disable-zlib"
        fi
    fi
@@ -341,7 +346,7 @@ rm -f ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build
 cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1

 ./configure \
-    --cross-prefix="${TARGET_HOST}-" \
+    --cross-prefix="${BUILD_HOST}-" \
    --sysroot="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot" \
    --prefix="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
    --pkg-config="${HOST_PKG_CONFIG_PATH}" \
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fontconfig"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fontconfig} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
    --disable-rpath \
    --disable-libxml2 \
    --disable-docs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="freetype"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -58,7 +58,7 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib
    --disable-shared \
    --disable-fast-install \
    --disable-mmap \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fribidi"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fribidi} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -52,7 +52,7 @@ fi
    --disable-fast-install \
    --disable-debug \
    --disable-deprecated \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="giflib"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR"
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_giflib} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -50,7 +50,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gmp"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gmp} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -51,7 +51,7 @@ fi
    --disable-shared \
    --disable-fast-install \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gnutls"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 COMMON_CFLAGS=$(get_cflags ${LIB_NAME})
 COMMON_CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -58,7 +58,7 @@ esac

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gnutls} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -83,7 +83,7 @@ fi
    --disable-tests \
    --disable-tools \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="jpeg"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="kvazaar"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -40,7 +40,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_kvazaar} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -62,7 +62,7 @@ LIBS="${ARCH_SPECIFIC_LIBS}" ./configure \
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="lame"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_lame} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
    --disable-frontend \
    --disable-efence \
    --disable-gtktest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="leptonica"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export CPPFLAGS="-I${BASEDIR}/prebuilt/android-$(get_target_build)/giflib/include"
@@ -54,7 +54,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_leptonica} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -72,7 +72,7 @@ fi
    --disable-shared \
    --disable-fast-install \
    --disable-programs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libaom"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libass"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libass} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -69,7 +69,7 @@ esac
    --disable-profile \
    --disable-coretext \
    ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libiconv"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libiconv} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -50,7 +50,7 @@ fi
    --disable-shared \
    --disable-fast-install \
    --disable-rpath \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libilbc"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libilbc} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libogg"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libogg} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,29 +23,29 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libpng"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})

-CPU_SPECIFIC_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
    x86 | x86-64)
-        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-intel-sse=yes"
+        ARCH_OPTIONS="--enable-hardware-optimizations --enable-intel-sse=yes"
    ;;
    arm-v7a-neon | arm64-v8a)
-        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-arm-neon=yes"
+        ARCH_OPTIONS="--enable-hardware-optimizations --enable-arm-neon=yes"
    ;;
    arm-v7a)
        # hardware-optimizations not enabled because
        # when --enable-hardware-optimizations is added
        # make tries to build arm-neon specific instructions, which breaks compilation
-        CPU_SPECIFIC_OPTIONS="--enable-arm-neon=no"
+        ARCH_OPTIONS="--enable-arm-neon=no"
    ;;
 esac

@@ -53,7 +53,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libpng} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -67,8 +67,8 @@ fi
    --disable-fast-install \
    --disable-unversioned-libpng-pc \
    --disable-unversioned-libpng-config \
-    ${CPU_SPECIFIC_OPTIONS} \
-    --host=${TARGET_HOST} || exit 1
+    ${ARCH_OPTIONS} \
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+if [[ -z ${ANDROID_NDK_ROOT} ]]; then
+    echo -e "(*) ANDROID_NDK_ROOT not defined\n"
+    exit 1
+fi
+
+if [[ -z ${ARCH} ]]; then
+    echo -e "(*) ARCH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${API} ]]; then
+    echo -e "(*) API not defined\n"
+    exit 1
+fi
+
+if [[ -z ${BASEDIR} ]]; then
+    echo -e "(*) BASEDIR not defined\n"
+    exit 1
+fi
+
+# ENABLE COMMON FUNCTIONS
+. ${BASEDIR}/build/android-common.sh
+
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
+LIB_NAME="libsamplerate"
+set_toolchain_clang_paths ${LIB_NAME}
+
+# PREPARING FLAGS
+BUILD_HOST=$(get_build_host)
+export CFLAGS=$(get_cflags ${LIB_NAME})
+export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+export LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
+
+cd ${BASEDIR}/src/${LIB_NAME} || exit 1
+
+make distclean 2>/dev/null 1>/dev/null
+
+# RECONFIGURE IF REQUESTED
+if [[ ${RECONF_libsamplerate} -eq 1 ]]; then
+    autoreconf_library ${LIB_NAME}
+fi
+
+./configure \
+    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
+    --with-pic \
+    --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${TOOLCHAIN}/sysroot \
+    --enable-static \
+    --disable-fftw \
+    --disable-shared \
+    --disable-fast-install \
+    --host=${BUILD_HOST} || exit 1
+
+# DISABLE building of examples manually
+${SED_INLINE} 's/examples tests//g' ${BASEDIR}/src/${LIB_NAME}/Makefile
+
+make -j$(get_cpu_count) || exit 1
+
+# MANUALLY COPY PKG-CONFIG FILES
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
+
+make install || exit 1
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libsndfile"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -53,7 +53,7 @@ fi
    --disable-alsa \
    --disable-full-suite \
    --disable-external-libs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libtheora"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libtheora} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -60,7 +60,7 @@ fi
    --disable-sdltest \
    ${ASM_FLAGS} \
    --disable-valgrind-testing \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libuuid"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libuuid} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvidstab"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvorbis"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -55,7 +55,7 @@ PKG_CONFIG= ./configure \
    --disable-docs \
    --disable-examples \
    --disable-oggtest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,7 +23,7 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvpx"
 set_toolchain_clang_paths ${LIB_NAME}

@@ -23,23 +23,23 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libwebp"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

-SIMD_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
    arm-v7a)
-        SIMD_OPTIONS="-DWEBP_ENABLE_SIMD=OFF"
+        ARCH_OPTIONS="-DWEBP_ENABLE_SIMD=OFF"
    ;;
    *)
-        SIMD_OPTIONS="-DWEBP_ENABLE_SIMD=ON"
+        ARCH_OPTIONS="-DWEBP_ENABLE_SIMD=ON"
    ;;
 esac

@@ -95,7 +95,7 @@ cmake -Wno-dev \
    -DWEBP_BUILD_IMG2WEBP=0 \
    -DWEBP_BUILD_WEBPMUX=0 \
    -DWEBP_BUILD_WEBPINFO=0 \
-    ${SIMD_OPTIONS} \
+    ${ARCH_OPTIONS} \
    -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
    -DBUILD_SHARED_LIBS=0 .. || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libxml2"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -44,7 +44,7 @@ make distclean 2>/dev/null 1>/dev/null
 # #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
 #

-# ALWAYS RECONFIGURED
+# ALWAYS RECONFIGURE
 autoreconf_library ${LIB_NAME}

 ./configure \
@@ -60,7 +60,7 @@ autoreconf_library ${LIB_NAME}
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="nettle"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -47,7 +47,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_nettle} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -65,7 +65,7 @@ fi
    --disable-gcov \
    --disable-documentation \
    ${OPTIONAL_CPU_SUPPORT} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="opencore-amr"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_opencore_amr} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -50,7 +50,7 @@ fi
    --disable-shared \
    --disable-fast-install \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="openh264"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="opus"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_opus} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ fi
    --disable-maintainer-mode \
    --disable-doc \
    --disable-extra-programs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+if [[ -z ${ANDROID_NDK_ROOT} ]]; then
+    echo -e "(*) ANDROID_NDK_ROOT not defined\n"
+    exit 1
+fi
+
+if [[ -z ${ARCH} ]]; then
+    echo -e "(*) ARCH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${API} ]]; then
+    echo -e "(*) API not defined\n"
+    exit 1
+fi
+
+if [[ -z ${BASEDIR} ]]; then
+    echo -e "(*) BASEDIR not defined\n"
+    exit 1
+fi
+
+# ENABLE COMMON FUNCTIONS
+. ${BASEDIR}/build/android-common.sh
+
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
+LIB_NAME="rubberband"
+set_toolchain_clang_paths ${LIB_NAME}
+
+# PREPARING FLAGS
+BUILD_HOST=$(get_build_host)
+CFLAGS=$(get_cflags ${LIB_NAME})
+CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}
+
+cd ${BASEDIR}/src/${LIB_NAME} || exit 1
+
+make distclean 2>/dev/null 1>/dev/null
+
+# DISABLE OPTIONAL FEATURES MANUALLY, SINCE ./configure DOES NOT PROVIDE OPTIONS FOR THEM
+rm -f ${BASEDIR}/src/${LIB_NAME}/configure.ac
+cp ${BASEDIR}/tools/make/rubberband/configure.ac ${BASEDIR}/src/${LIB_NAME}/configure.ac
+rm -f ${BASEDIR}/src/${LIB_NAME}/Makefile.in
+cp ${BASEDIR}/tools/make/rubberband/Makefile.android.in ${BASEDIR}/src/${LIB_NAME}/Makefile.in
+
+# FIX PACKAGE CONFIG FILE DEPENDENCIES
+rm -f ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+cp ${BASEDIR}/tools/make/rubberband/rubberband.pc.in ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+${SED_INLINE} 's/%DEPENDENCIES%/sndfile, samplerate/g' ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+
+# ALWAYS RECONFIGURE
+autoreconf_library ${LIB_NAME}
+
+# MANUALLY CREATE LIB DIRECTORY
+mkdir -p ${BASEDIR}/src/${LIB_NAME}/lib || exit 1
+
+./configure \
+    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
+    --host=${BUILD_HOST} || exit 1
+
+make AR="$AR" -j$(get_cpu_count) || exit 1
+
+make install || exit 1
+
+# MANUALLY COPY PKG-CONFIG FILES
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="sdl"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_sdl} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -51,7 +51,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="shine"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_shine} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -49,7 +49,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="snappy"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="soxr"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="speex"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -43,7 +43,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_speex} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ fi
    --disable-shared \
    --disable-binaries \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="tesseract"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -60,7 +60,7 @@ export ac_cv_c_bigendian=no
    --disable-cube \
    --disable-tessdata-prefix \
    --disable-largefile \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 ${SED_INLINE} 's/\-lrt//g' ${BASEDIR}/src/${LIB_NAME}/api/Makefile

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="tiff"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_tiff} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
    --disable-cxx \
    --disable-win32-io \
    --disable-lzma \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="twolame"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -38,7 +38,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_twolame} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -53,7 +53,7 @@ export SNDFILE_LIBS="$(pkg-config --libs --static sndfile)"
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="wavpack"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_wavpack} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -52,7 +52,7 @@ fi
    --disable-apps \
    --disable-fast-install \
    --disable-tests \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -28,12 +28,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="x264"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -71,7 +71,7 @@ esac
    --enable-static \
    --disable-cli \
    ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="x265"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,19 +42,19 @@ if [[ ${DOWNLOAD_RESULT} -ne 0 ]]; then
 fi
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1

-ASM_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
    arm-v7a | arm-v7a-neon)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
    ;;
    arm64-v8a)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
    ;;
    x86)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
    ;;
    x86-64)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
    ;;
 esac

@@ -87,7 +87,7 @@ cmake -Wno-dev \
    -DSTATIC_LINK_CRT=1 \
    -DENABLE_PIC=1 \
    -DENABLE_CLI=0 \
-    ${ASM_OPTIONS} \
+    ${ARCH_OPTIONS} \
    -DCMAKE_SYSTEM_PROCESSOR="${ARCH}" \
    -DENABLE_SHARED=0 ../source || exit 1

@@ -23,12 +23,12 @@ fi
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="xvidcore"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -37,7 +37,7 @@ cd ${BASEDIR}/src/${LIB_NAME}/build/generic || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_xvidcore} -eq 1 ]]; then
    ./bootstrap.sh
 fi
@@ -55,7 +55,7 @@ esac
 ./configure \
    --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
    ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="chromaprint"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -39,33 +39,35 @@ get_library_name() {
        18) echo "xvidcore" ;;
        19) echo "x265" ;;
        20) echo "libvidstab" ;;
-        21) echo "libilbc" ;;
-        22) echo "opus" ;;
-        23) echo "snappy" ;;
-        24) echo "soxr" ;;
-        25) echo "libaom" ;;
-        26) echo "chromaprint" ;;
-        27) echo "twolame" ;;
-        28) echo "sdl" ;;
-        29) echo "tesseract" ;;
-        30) echo "openh264" ;;
-        31) echo "giflib" ;;
-        32) echo "jpeg" ;;
-        33) echo "libogg" ;;
-        34) echo "libpng" ;;
-        35) echo "libuuid" ;;
+        21) echo "rubberband" ;;
+        22) echo "libilbc" ;;
+        23) echo "opus" ;;
+        24) echo "snappy" ;;
+        25) echo "soxr" ;;
+        26) echo "libaom" ;;
+        27) echo "chromaprint" ;;
+        28) echo "twolame" ;;
+        29) echo "sdl" ;;
+        30) echo "tesseract" ;;
+        31) echo "openh264" ;;
+        32) echo "giflib" ;;
+        33) echo "jpeg" ;;
+        34) echo "libogg" ;;
+        35) echo "libpng" ;;
        36) echo "nettle" ;;
        37) echo "tiff" ;;
        38) echo "expat" ;;
        39) echo "libsndfile" ;;
        40) echo "leptonica" ;;
-        41) echo "ios-zlib" ;;
-        42) echo "ios-audiotoolbox" ;;
-        43) echo "ios-coreimage" ;;
-        44) echo "ios-bzip2" ;;
-        45) echo "ios-videotoolbox" ;;
-        46) echo "ios-avfoundation" ;;
-        47) echo "ios-libiconv" ;;
+        41) echo "libsamplerate" ;;
+        42) echo "ios-zlib" ;;
+        43) echo "ios-audiotoolbox" ;;
+        44) echo "ios-coreimage" ;;
+        45) echo "ios-bzip2" ;;
+        46) echo "ios-videotoolbox" ;;
+        47) echo "ios-avfoundation" ;;
+        48) echo "ios-libiconv" ;;
+        49) echo "ios-libuuid" ;;
    esac
 }

@@ -79,15 +81,16 @@ get_package_config_file_name() {
        11) echo "libxml-2.0" ;;
        12) echo "opencore-amrnb" ;;
        20) echo "vidstab" ;;
-        25) echo "aom" ;;
-        26) echo "libchromaprint" ;;
-        28) echo "sdl2" ;;
-        32) echo "libjpeg" ;;
-        33) echo "ogg" ;;
-        35) echo "uuid" ;;
+        26) echo "aom" ;;
+        27) echo "libchromaprint" ;;
+        29) echo "sdl2" ;;
+        33) echo "libjpeg" ;;
+        34) echo "ogg" ;;
        37) echo "libtiff-4" ;;
        39) echo "sndfile" ;;
        40) echo "lept" ;;
+        41) echo "samplerate" ;;
+        49) echo "uuid" ;;
        *) echo $(get_library_name $1)
    esac
 }
@@ -103,17 +106,17 @@ get_static_archive_name() {
        9) echo "libvpx.a" ;;
        11) echo "libxml2.a" ;;
        20) echo "libvidstab.a" ;;
-        21) echo "libilbc.a" ;;
-        25) echo "libaom.a" ;;
-        27) echo "libtwolame.a" ;;
-        28) echo "libSDL2.a" ;;
-        29) echo "libtesseract.a" ;;
-        31) echo "libgif.a" ;;
-        33) echo "libogg.a" ;;
-        34) echo "libpng.a" ;;
-        35) echo "libuuid.a" ;;
+        22) echo "libilbc.a" ;;
+        26) echo "libaom.a" ;;
+        28) echo "libtwolame.a" ;;
+        29) echo "libSDL2.a" ;;
+        30) echo "libtesseract.a" ;;
+        32) echo "libgif.a" ;;
+        34) echo "libogg.a" ;;
+        35) echo "libpng.a" ;;
        39) echo "libsndfile.a" ;;
        40) echo "liblept.a" ;;
+        41) echo "libsamplerate.a" ;;
        *) echo lib$(get_library_name $1).a
    esac
 }
@@ -126,20 +129,35 @@ get_arch_name() {
        3) echo "arm64e" ;;
        4) echo "i386" ;;
        5) echo "x86-64" ;;
+        6) echo "x86-64-mac-catalyst" ;;
    esac
 }

 get_target_host() {
+      case ${ARCH} in
+        x86-64-mac-catalyst)
+            echo "x86_64-apple-ios13.0-macabi"
+        ;;
+        *)
+            echo "$(get_target_arch)-ios-darwin"
+        ;;
+    esac
+}
+
+get_build_host() {
    echo "$(get_target_arch)-ios-darwin"
 }

 get_target_build_directory() {
    case ${ARCH} in
        x86-64)
-            echo "ios-x86_64-apple-darwin"
+            echo "ios-x86_64"
+        ;;
+        x86-64-mac-catalyst)
+            echo "ios-x86_64-mac-catalyst"
        ;;
        *)
-            echo "ios-${ARCH}-apple-darwin"
+            echo "ios-${ARCH}"
        ;;
    esac
 }
@@ -149,7 +167,7 @@ get_target_arch() {
        arm64 | arm64e)
            echo "aarch64"
        ;;
-        x86-64)
+        x86-64 | x86-64-mac-catalyst)
            echo "x86_64"
        ;;
        *)
@@ -170,6 +188,9 @@ get_sdk_name() {
        i386 | x86-64)
            echo "iphonesimulator"
        ;;
+        x86-64-mac-catalyst)
+            echo "macosx"
+        ;;
    esac
 }

@@ -185,6 +206,9 @@ get_min_version_cflags() {
        i386 | x86-64)
            echo "-mios-simulator-version-min=${IOS_MIN_VERSION}"
        ;;
+        x86-64-mac-catalyst)
+            echo "-miphoneos-version-min=13.0"
+        ;;
    esac
 }

@@ -203,6 +227,9 @@ get_common_cflags() {
        i386 | x86-64)
            echo "-fstrict-aliasing -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
        ;;
+        x86-64-mac-catalyst)
+            echo "-fstrict-aliasing -fembed-bitcode ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
+        ;;
        *)
            echo "-fstrict-aliasing -fembed-bitcode -DIOS ${LTS_BUILD_FLAG}${BUILD_DATE} -isysroot ${SDK_PATH}"
        ;;
@@ -229,6 +256,9 @@ get_arch_specific_cflags() {
        x86-64)
            echo "-arch x86_64 -target $(get_target_host) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DMOBILE_FFMPEG_X86_64"
        ;;
+        x86-64-mac-catalyst)
+            echo "-arch x86_64 -target $(get_target_host) -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -DMOBILE_FFMPEG_X86_64_MAC_CATALYST -isysroot ${SDK_PATH} -isystem ${SDK_PATH}/System/iOSSupport/usr/include -iframework ${SDK_PATH}/System/iOSSupport/System/Library/Frameworks"
+        ;;
    esac
 }

@@ -236,31 +266,11 @@ get_size_optimization_cflags() {

    local ARCH_OPTIMIZATION=""
    case ${ARCH} in
-        armv7 | armv7s | arm64 | arm64e)
-            case $1 in
-                x264 | x265)
-                    ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
-                ;;
-                ffmpeg | mobile-ffmpeg)
-                    ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
-                ;;
-                *)
-                    ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
-                ;;
-            esac
+        armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
+          ARCH_OPTIMIZATION="-Oz -Wno-ignored-optimization-argument"
        ;;
        i386 | x86-64)
-            case $1 in
-                x264 | ffmpeg)
-                    ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
-                ;;
-                x265)
-                    ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
-                ;;
-                *)
-                    ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
-                ;;
-            esac
+          ARCH_OPTIMIZATION="-O2 -Wno-ignored-optimization-argument"
        ;;
    esac

@@ -273,7 +283,7 @@ get_size_optimization_asm_cflags() {
    case $1 in
        jpeg | ffmpeg)
            case ${ARCH} in
-                armv7 | armv7s | arm64 | arm64e)
+                armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
                    ARCH_OPTIMIZATION="-Oz"
                ;;
                i386 | x86-64)
@@ -381,7 +391,7 @@ get_cxxflags() {

    local BITCODE_FLAGS=""
    case ${ARCH} in
-        armv7 | armv7s | arm64 | arm64e)
+        armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
            local BITCODE_FLAGS="-fembed-bitcode"
        ;;
    esac
@@ -393,15 +403,18 @@ get_cxxflags() {
        gnutls)
            echo "-std=c++11 -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
        ;;
-        opencore-amr)
-            echo "-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}"
        ;;
+        opencore-amr)
+            echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+        ;;
+        rubberband)
+            echo "-fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
+        ;;
        *)
            echo "-std=c++11 -fno-exceptions -fno-rtti ${BITCODE_FLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_FLAGS}"
        ;;
@@ -418,7 +431,7 @@ get_common_ldflags() {

 get_size_optimization_ldflags() {
    case ${ARCH} in
-        armv7 | armv7s | arm64 | arm64e)
+        armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
            case $1 in
                ffmpeg | mobile-ffmpeg)
                    echo "-Oz -dead_strip"
@@ -444,22 +457,25 @@ get_size_optimization_ldflags() {
 get_arch_specific_ldflags() {
    case ${ARCH} in
        armv7)
-            echo "-arch armv7 -march=armv7 -mfpu=neon -mfloat-abi=softfp -fembed-bitcode"
+            echo "-arch armv7 -march=armv7 -mfpu=neon -mfloat-abi=softfp -fembed-bitcode -target $(get_target_host)"
        ;;
        armv7s)
-            echo "-arch armv7s -march=armv7s -mfpu=neon -mfloat-abi=softfp -fembed-bitcode"
+            echo "-arch armv7s -march=armv7s -mfpu=neon -mfloat-abi=softfp -fembed-bitcode -target $(get_target_host)"
        ;;
        arm64)
-            echo "-arch arm64 -march=armv8-a+crc+crypto -fembed-bitcode"
+            echo "-arch arm64 -march=armv8-a+crc+crypto -fembed-bitcode -target $(get_target_host)"
        ;;
        arm64e)
-            echo "-arch arm64e -march=armv8.3-a+crc+crypto -fembed-bitcode"
+            echo "-arch arm64e -march=armv8.3-a+crc+crypto -fembed-bitcode -target $(get_target_host)"
        ;;
        i386)
-            echo "-arch i386 -march=i386"
+            echo "-arch i386 -march=i386 -target $(get_target_host)"
        ;;
        x86-64)
-            echo "-arch x86_64 -march=x86-64"
+            echo "-arch x86_64 -march=x86-64 -target $(get_target_host)"
+        ;;
+        x86-64-mac-catalyst)
+            echo "-arch x86_64 -march=x86-64 -target $(get_target_host) -isysroot ${SDK_PATH} -L${SDK_PATH}/System/iOSSupport/usr/lib -iframework ${SDK_PATH}/System/iOSSupport/System/Library/Frameworks"
        ;;
    esac
 }
@@ -477,7 +493,7 @@ get_ldflags() {
    case $1 in
        mobile-ffmpeg)
            case ${ARCH} in
-                armv7 | armv7s | arm64 | arm64e)
+                armv7 | armv7s | arm64 | arm64e | x86-64-mac-catalyst)
                    echo "${ARCH_FLAGS} ${LINKED_LIBRARIES} ${COMMON_FLAGS} -fembed-bitcode -Wc,-fembed-bitcode ${OPTIMIZATION_FLAGS}"
                ;;
                *)
@@ -614,7 +630,7 @@ Cflags: -I\${includedir}
 EOF
 }

-create_libiconv_package_config() {
+create_libiconv_system_package_config() {
    local LIB_ICONV_VERSION=$(grep '_LIBICONV_VERSION' ${SDK_PATH}/usr/include/iconv.h | grep -Eo '0x.*' | grep -Eo '.*    ')

    cat > "${INSTALL_PKG_CONFIG_DIR}/libiconv.pc" << EOF
@@ -802,13 +818,13 @@ Cflags: -I\${includedir}
 EOF
 }

-create_uuid_package_config() {
+create_libuuid_system_package_config() {
    local UUID_VERSION="$1"

    cat > "${INSTALL_PKG_CONFIG_DIR}/uuid.pc" << EOF
-prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/libuuid
+prefix=${SDK_PATH}
 exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
+libdir=\${exec_prefix}/usr/lib
 includedir=\${prefix}/include

 Name: uuid
@@ -816,7 +832,7 @@ Description: Universally unique id library
 Version: ${UUID_VERSION}
 Requires:
 Cflags: -I\${includedir}
-Libs: -L\${libdir} -luuid
+Libs: -L\${libdir}
 EOF
 }

@@ -839,7 +855,7 @@ Cflags: -I\${includedir}
 EOF
 }

-create_zlib_package_config() {
+create_zlib_system_package_config() {
    ZLIB_VERSION=$(grep '#define ZLIB_VERSION' ${SDK_PATH}/usr/include/zlib.h | grep -Eo '\".*\"' | sed -e 's/\"//g')

    cat > "${INSTALL_PKG_CONFIG_DIR}/zlib.pc" << EOF
@@ -858,7 +874,7 @@ Cflags: -I\${includedir}
 EOF
 }

-create_bzip2_package_config() {
+create_bzip2_system_package_config() {
    BZIP2_VERSION=$(grep -Eo 'version.*of' ${SDK_PATH}/usr/include/bzlib.h | sed -e 's/of//;s/version//g;s/\ //g')

    cat > "${INSTALL_PKG_CONFIG_DIR}/bzip2.pc" << EOF
@@ -940,6 +956,12 @@ download_gpl_library_source() {
            GPL_LIB_ORIG_DIR="xvidcore"
            GPL_LIB_DEST_DIR="xvidcore"
        ;;
+        rubberband)
+            GPL_LIB_URL="https://breakfastquay.com/files/releases/rubberband-1.8.2.tar.bz2"
+            GPL_LIB_FILE="rubberband-1.8.2.tar.bz2"
+            GPL_LIB_ORIG_DIR="rubberband-1.8.2"
+            GPL_LIB_DEST_DIR="rubberband"
+        ;;
    esac

    local GPL_LIB_SOURCE_PATH="${BASEDIR}/src/${GPL_LIB_DEST_DIR}"
@@ -1028,8 +1050,6 @@ set_toolchain_clang_paths() {
        LOCAL_GAS_PREPROCESSOR="${BASEDIR}/src/x264/tools/gas-preprocessor.pl"
    fi

-    TARGET_HOST=$(get_target_host)
-    
    export AR="$(xcrun --sdk $(get_sdk_name) -f ar)"
    export CC="clang"
    export OBJC="$(xcrun --sdk $(get_sdk_name) -f clang)"
@@ -1068,21 +1088,26 @@ set_toolchain_clang_paths() {
    export ZLIB_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/zlib.pc"
    export BZIP2_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/bzip2.pc"
    export LIB_ICONV_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/libiconv.pc"
+    export LIB_UUID_PACKAGE_CONFIG_PATH="${INSTALL_PKG_CONFIG_DIR}/uuid.pc"

    if [ ! -d ${INSTALL_PKG_CONFIG_DIR} ]; then
        mkdir -p ${INSTALL_PKG_CONFIG_DIR}
    fi

    if [ ! -f ${ZLIB_PACKAGE_CONFIG_PATH} ]; then
-        create_zlib_package_config
+        create_zlib_system_package_config
    fi

    if [ ! -f ${LIB_ICONV_PACKAGE_CONFIG_PATH} ]; then
-        create_libiconv_package_config
+        create_libiconv_system_package_config
    fi

    if [ ! -f ${BZIP2_PACKAGE_CONFIG_PATH} ]; then
-        create_bzip2_package_config
+        create_bzip2_system_package_config
+    fi
+
+    if [ ! -f ${LIB_UUID_PACKAGE_CONFIG_PATH} ]; then
+        create_libuuid_system_package_config
    fi

    prepare_inline_sed
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="expat"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_expat} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -55,7 +55,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -32,12 +32,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="ffmpeg"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 FFMPEG_CFLAGS=""
 FFMPEG_LDFLAGS=""
 export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
@@ -46,6 +46,7 @@ TARGET_CPU=""
 TARGET_ARCH=""
 BITCODE_FLAGS=""
 NEON_FLAG=""
+ARCH_OPTIONS="--enable-asm"
 case ${ARCH} in
    armv7)
        TARGET_CPU="armv7"
@@ -78,19 +79,27 @@ case ${ARCH} in
        BITCODE_FLAGS=""
    ;;
    x86-64)
+        ARCH_OPTIONS="--disable-asm"
        TARGET_CPU="x86_64"
        TARGET_ARCH="x86_64"
        NEON_FLAG="	--disable-neon"
        BITCODE_FLAGS=""
    ;;
+    x86-64-mac-catalyst)
+        ARCH_OPTIONS="--disable-asm"
+        TARGET_CPU="x86_64"
+        TARGET_ARCH="x86_64"
+        NEON_FLAG="	--disable-neon"
+        BITCODE_FLAGS="-fembed-bitcode -Wc,-fembed-bitcode"
+    ;;
 esac

 if [[ ${APPLE_TVOS_BUILD} -eq 1 ]]; then
    CONFIGURE_POSTFIX="--disable-avfoundation"
-    LIBRARY_COUNT=47
+    LIBRARY_COUNT=49
 else
    CONFIGURE_POSTFIX=""
-    LIBRARY_COUNT=48
+    LIBRARY_COUNT=50
 fi

 library=1
@@ -205,6 +214,12 @@ do
                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static opus)"
                CONFIGURE_POSTFIX+=" --enable-libopus"
            ;;
+            rubberband)
+                FFMPEG_CFLAGS+=" $(pkg-config --cflags rubberband)"
+                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static rubberband)"
+                FFMPEG_LDFLAGS+=" -framework Accelerate"
+                CONFIGURE_POSTFIX+=" --enable-librubberband --enable-gpl"
+            ;;
            sdl)
                FFMPEG_CFLAGS+=" $(pkg-config --cflags sdl2)"
                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static sdl2)"
@@ -274,10 +289,6 @@ do
                FFMPEG_CFLAGS+=" $(pkg-config --cflags libpng)"
                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static libpng)"
            ;;
-            libuuid)
-                FFMPEG_CFLAGS+=" $(pkg-config --cflags uuid)"
-                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static uuid)"
-            ;;
            nettle)
                FFMPEG_CFLAGS+=" $(pkg-config --cflags nettle)"
                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static nettle)"
@@ -319,21 +330,21 @@ do
    else

        # THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
-        if [[ ${library} -eq 29 ]]; then
+        if [[ ${library} -eq 30 ]]; then
            CONFIGURE_POSTFIX+=" --disable-sdl2"
-        elif [[ ${library} -eq 42 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-zlib"
        elif [[ ${library} -eq 43 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-audiotoolbox"
+            CONFIGURE_POSTFIX+=" --disable-zlib"
        elif [[ ${library} -eq 44 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-coreimage"
+            CONFIGURE_POSTFIX+=" --disable-audiotoolbox"
        elif [[ ${library} -eq 45 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-bzlib"
+            CONFIGURE_POSTFIX+=" --disable-coreimage"
        elif [[ ${library} -eq 46 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-videotoolbox"
+            CONFIGURE_POSTFIX+=" --disable-bzlib"
        elif [[ ${library} -eq 47 ]]; then
-            CONFIGURE_POSTFIX+=" --disable-avfoundation"
+            CONFIGURE_POSTFIX+=" --disable-videotoolbox"
        elif [[ ${library} -eq 48 ]]; then
+            CONFIGURE_POSTFIX+=" --disable-avfoundation"
+        elif [[ ${library} -eq 49 ]]; then
            CONFIGURE_POSTFIX+=" --disable-iconv"
        fi
    fi
@@ -400,6 +411,13 @@ ${SED_INLINE} 's/check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic;/
 rm -f ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1
 cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB_NAME}/libswscale/aarch64/hscale.S 1>>${BASEDIR}/build.log 2>&1

+# Workaround for videotoolbox on mac catalyst
+if [ ${ARCH} == "x86-64-mac-catalyst" ]; then
+    ${SED_INLINE} 's/    CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/   \/\/ CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/g' ${BASEDIR}/src/${LIB_NAME}/libavcodec/videotoolbox.c
+else
+    ${SED_INLINE} 's/   \/\/ CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/    CFDictionarySetValue(buffer_attributes\, kCVPixelBufferOpenGLESCompatibilityKey/g' ${BASEDIR}/src/${LIB_NAME}/libavcodec/videotoolbox.c
+fi
+
 ./configure \
    --sysroot=${SDK_PATH} \
    --prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME} \
@@ -416,7 +434,7 @@ cp ${BASEDIR}/tools/make/ffmpeg/libswscale/aarch64/hscale.S ${BASEDIR}/src/${LIB
    ${NEON_FLAG} \
    --enable-cross-compile \
    --enable-pic \
-    --enable-asm \
+    ${ARCH_OPTIONS} \
    --enable-inline-asm \
    --enable-optimizations \
    --enable-swscale \
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fontconfig"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fontconfig} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -59,7 +59,7 @@ fi
    --disable-rpath \
    --disable-libxml2 \
    --disable-docs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 # DISABLE IOS TESTS with system() calls - system() is deprecated for IOS
 # 1. test-bz106632.c
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="freetype"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -62,7 +62,7 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/libpng/l
    --disable-shared \
    --disable-fast-install \
    --disable-mmap \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="fribidi"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_fribidi} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ fi
    --disable-fast-install \
    --disable-debug \
    --disable-deprecated \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="giflib"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})" -DS_IREAD=S_IRUSR -DS_IWRITE=S_IWUSR"
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_giflib} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -54,7 +54,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,7 +27,7 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gmp"
 set_toolchain_clang_paths ${LIB_NAME}

@@ -39,7 +39,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gmp} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -47,10 +47,17 @@ fi
 # PREPARING FLAGS
 case ${ARCH} in
    i386)
-        TARGET_HOST="x86-apple-darwin"
+        unset gmp_cv_asm_w32
+        BUILD_HOST="x86-apple-darwin"
+    ;;
+    x86-64-mac-catalyst)
+        # Workaround for 'cannot determine how to define a 32-bit word' error
+        export gmp_cv_asm_w32=".long"
+        BUILD_HOST=$(get_build_host)
    ;;
    *)
-        TARGET_HOST=$(get_target_host)
+        unset gmp_cv_asm_w32
+        BUILD_HOST=$(get_build_host)
    ;;
 esac

@@ -63,7 +70,7 @@ esac
    --disable-assembly \
    --disable-fast-install \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="gnutls"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 COMMON_CFLAGS=$(get_cflags ${LIB_NAME})
 COMMON_CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -48,18 +48,18 @@ export HOGWEED_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/nettle/
 export GMP_CFLAGS="-I${BASEDIR}/prebuilt/$(get_target_build_directory)/gmp/include"
 export GMP_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/gmp/lib -lgmp"

-HARDWARE_ACCELERATION=""
+ARCH_OPTIONS=""
 case ${ARCH} in
    arm64 | arm64e)
-        HARDWARE_ACCELERATION="--enable-hardware-acceleration"
+        ARCH_OPTIONS="--enable-hardware-acceleration"
    ;;
    i386)
        # DISABLING thread_local WHICH IS NOT SUPPORTED ON i386
        export CFLAGS+=" -D__thread="
-        HARDWARE_ACCELERATION="--enable-hardware-acceleration"
+        ARCH_OPTIONS="--enable-hardware-acceleration"
    ;;
    *)
-        HARDWARE_ACCELERATION="--enable-hardware-acceleration"
+        ARCH_OPTIONS="--enable-hardware-acceleration"
    ;;
 esac

@@ -71,7 +71,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_gnutls} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -84,7 +84,7 @@ fi
    --with-included-unistring \
    --without-idn \
    --without-p11-kit \
-    ${HARDWARE_ACCELERATION} \
+    ${ARCH_OPTIONS} \
    --enable-static \
    --disable-openssl-compatibility \
    --disable-shared \
@@ -96,7 +96,7 @@ fi
    --disable-tests \
    --disable-tools \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,25 +27,25 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="jpeg"
 set_toolchain_clang_paths ${LIB_NAME}
 export CCAS=${AS}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 export ASM_FLAGS=$(get_asmflags ${LIB_NAME})

-SIMD_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
    armv7 | armv7s | arm64 | arm64e)
-        SIMD_OPTIONS="-DWITH_SIMD=1"
+        ARCH_OPTIONS="-DWITH_SIMD=1"
    ;;
    *)
-        SIMD_OPTIONS="-DWITH_SIMD=0"
+        ARCH_OPTIONS="-DWITH_SIMD=0"
    ;;
 esac

@@ -80,7 +80,7 @@ cmake -Wno-dev \
    -DENABLE_STATIC=1 \
    -DENABLE_SHARED=0 \
    -DWITH_JPEG8=1 \
-    ${SIMD_OPTIONS} \
+    ${ARCH_OPTIONS} \
    -DWITH_TURBOJPEG=0 \
    -DWITH_JAVA=0 \
    -DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \
@@ -27,17 +27,22 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="kvazaar"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
+ARCH_OPTIONS=""
 case ${ARCH} in
    i386)
-        TARGET_HOST="x86-apple-darwin"
+        BUILD_HOST="x86-apple-darwin"
+    ;;
+    x86-64 | x86-64-mac-catalyst)
+        ARCH_OPTIONS="--disable-asm"
+        BUILD_HOST=$(get_build_host)
    ;;
    *)
-        TARGET_HOST=$(get_target_host)
+        BUILD_HOST=$(get_build_host)
    ;;
 esac
 export CFLAGS=$(get_cflags ${LIB_NAME})
@@ -51,7 +56,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_kvazaar} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -63,7 +68,8 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    ${ARCH_OPTIONS} \
+    --host=${BUILD_HOST} || exit 1

 make || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="lame"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_lame} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -59,7 +59,7 @@ fi
    --disable-frontend \
    --disable-efence \
    --disable-gtktest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="leptonica"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS="$(get_cflags ${LIB_NAME})"
 export CXXFLAGS="$(get_cxxflags ${LIB_NAME})"
 export CPPFLAGS="-I${BASEDIR}/prebuilt/$(get_target_build_directory)/giflib/include"
@@ -58,7 +58,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_leptonica} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -76,7 +76,7 @@ fi
    --disable-shared \
    --disable-fast-install \
    --disable-programs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libaom"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS="$(get_cflags ${LIB_NAME})"
 CXXFLAGS="$(get_cxxflags ${LIB_NAME})"
 LDFLAGS="$(get_ldflags ${LIB_NAME})"
@@ -62,7 +62,12 @@ case ${ARCH} in
    ;;
    x86-64)
        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/x86_64-ios-simulator.cmake"
-        ARCH_OPTIONS="-DARCH_X86_64=1 -DENABLE_SSE4_2=1 -DHAVE_SSE4_2=1"
+        ARCH_OPTIONS="-DARCH_X86_64=1 -DENABLE_SSE4_1=1 -DHAVE_SSE4_2=1"
+    ;;
+    x86-64-mac-catalyst)
+        cp ${BASEDIR}/tools/cmake/libaom.x86_64-mac-catalyst.cmake ${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/x86_64-mac-catalyst.cmake
+        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/x86_64-mac-catalyst.cmake"
+        ARCH_OPTIONS="-DARCH_X86_64=0 -DENABLE_SSE=0 -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSE4_1=0 -DENABLE_SSE4_2=0 -DENABLE_MMX=0 -DCONFIG_OS_SUPPORT=0 -DCONFIG_RUNTIME_CPU_DETECT=0"
    ;;
 esac

@@ -75,6 +80,17 @@ fi
 mkdir cmake-build;
 cd cmake-build

+# Workaround to disable asm on mac catalyst
+if [ ${ARCH} == "x86-64-mac-catalyst" ]; then
+    ${SED_INLINE} 's/define aom_clear_system_state() aom_reset_mmx_state()/define   aom_clear_system_state()/g' ${BASEDIR}/src/${LIB_NAME}/aom_ports/system_state.h
+    ${SED_INLINE} 's/ add_asm_library("aom_ports/#add_asm_library("aom_ports/g' ${BASEDIR}/src/${LIB_NAME}/aom_ports/aom_ports.cmake
+    ${SED_INLINE} 's/ target_sources(aom_ports/#target_sources(aom_ports/g' ${BASEDIR}/src/${LIB_NAME}/aom_ports/aom_ports.cmake
+else
+    ${SED_INLINE} 's/define   aom_clear_system_state()/define aom_clear_system_state() aom_reset_mmx_state()/g' ${BASEDIR}/src/${LIB_NAME}/aom_ports/system_state.h
+    ${SED_INLINE} 's/#add_asm_library("aom_ports/ add_asm_library("aom_ports/g' ${BASEDIR}/src/${LIB_NAME}/aom_ports/aom_ports.cmake
+    ${SED_INLINE} 's/#target_sources(aom_ports/ target_sources(aom_ports/g' ${BASEDIR}/src/${LIB_NAME}/aom_ports/aom_ports.cmake
+fi
+
 cmake -Wno-dev \
    -DCMAKE_VERBOSE_MAKEFILE=0 \
    -DCONFIG_PIC=1 \
@@ -27,22 +27,32 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libass"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}

+ARCH_OPTIONS=""
+case ${ARCH} in
+    x86-64 | x86-64-mac-catalyst)
+        ARCH_OPTIONS="--disable-asm"
+    ;;
+    *)
+        ARCH_OPTIONS="--enable-asm"
+    ;;
+esac
+
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libass} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -57,9 +67,10 @@ fi
    --disable-harfbuzz \
    --disable-fast-install \
    --disable-test \
+    ${ARCH_OPTIONS} \
    --disable-profile \
    --disable-coretext \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libilbc"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libilbc} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -53,7 +53,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libogg"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libogg} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -56,7 +56,7 @@ ${SED_INLINE} 's/sys\/types/stdint/g' ${BASEDIR}/src/libogg/include/ogg/os_types
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,24 +27,24 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libpng"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CPPFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})

-CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations=yes"
+ARCH_OPTIONS="--enable-hardware-optimizations=yes"
 case ${ARCH} in
-    x86 | x86-64)
-        CPU_SPECIFIC_OPTIONS+=" --enable-intel-sse=yes"
+    x86 | x86-64 | x86-64-mac-catalyst)
+        ARCH_OPTIONS+=" --enable-intel-sse=yes"
    ;;
    armv7 | armv7s | arm64 | arm64e)
-        CPU_SPECIFIC_OPTIONS+=" --enable-arm-neon=yes"
+        ARCH_OPTIONS+=" --enable-arm-neon=yes"
    ;;
 esac

@@ -52,7 +52,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libpng} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -66,8 +66,8 @@ fi
    --disable-fast-install \
    --disable-unversioned-libpng-pc \
    --disable-unversioned-libpng-config \
-    ${CPU_SPECIFIC_OPTIONS} \
-    --host=${TARGET_HOST} || exit 1
+    ${ARCH_OPTIONS} \
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+if [[ -z ${ARCH} ]]; then
+    echo -e "(*) ARCH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${TARGET_SDK} ]]; then
+    echo -e "(*) TARGET_SDK not defined\n"
+    exit 1
+fi
+
+if [[ -z ${SDK_PATH} ]]; then
+    echo -e "(*) SDK_PATH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${BASEDIR} ]]; then
+    echo -e "(*) BASEDIR not defined\n"
+    exit 1
+fi
+
+# ENABLE COMMON FUNCTIONS
+if [[ ${APPLE_TVOS_BUILD} -eq 1 ]]; then
+    . ${BASEDIR}/build/tvos-common.sh
+else
+    . ${BASEDIR}/build/ios-common.sh
+fi
+
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
+LIB_NAME="libsamplerate"
+set_toolchain_clang_paths ${LIB_NAME}
+
+# PREPARING FLAGS
+BUILD_HOST=$(get_build_host)
+export CFLAGS=$(get_cflags ${LIB_NAME})
+export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+export LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}
+
+cd ${BASEDIR}/src/${LIB_NAME} || exit 1
+
+make distclean 2>/dev/null 1>/dev/null
+
+# RECONFIGURE IF REQUESTED
+if [[ ${RECONF_libsamplerate} -eq 1 ]]; then
+    autoreconf_library ${LIB_NAME}
+fi
+
+./configure \
+    --prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME} \
+    --with-pic \
+    --with-sysroot=${SDK_PATH} \
+    --enable-static \
+    --disable-fftw \
+    --disable-shared \
+    --disable-fast-install \
+    --host=${BUILD_HOST} || exit 1
+
+# DISABLE building of examples manually
+${SED_INLINE} 's/examples tests//g' ${BASEDIR}/src/${LIB_NAME}/Makefile
+
+make -j$(get_cpu_count) || exit 1
+
+# MANUALLY COPY PKG-CONFIG FILES
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
+
+make install || exit 1
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libsndfile"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -57,7 +57,7 @@ fi
    --disable-alsa \
    --disable-full-suite \
    --disable-external-libs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libtheora"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libtheora} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -57,7 +57,7 @@ fi
    --disable-telemetry \
    --disable-sdltest \
    --disable-valgrind-testing \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libuuid"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libuuid} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -53,7 +53,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvidstab"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvorbis"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_libvorbis} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -63,7 +63,7 @@ PKG_CONFIG= ./configure \
    --disable-docs \
    --disable-examples \
    --disable-oggtest \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,7 +27,7 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libvpx"
 set_toolchain_clang_paths ${LIB_NAME}

@@ -68,7 +68,11 @@ case ${ARCH} in
    ;;
    x86-64)
        TARGET="x86_64-iphonesimulator-gcc"
-        ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512"
+        ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512 --disable-sse --disable-sse2 --disable-mmx"
+    ;;
+    x86-64-mac-catalyst)
+        TARGET="x86_64-macosx-gcc"
+        ASM_FLAGS="--enable-runtime-cpu-detect --disable-avx512 --disable-sse --disable-sse2 --disable-mmx"
    ;;
 esac

@@ -78,6 +82,9 @@ case ${ARCH} in
    arm64e)
        cp ${BASEDIR}/tools/make/configure.libvpx.arm64e.sh ${BASEDIR}/src/${LIB_NAME}/build/make/configure.sh
    ;;
+    x86-64-mac-catalyst)
+        cp ${BASEDIR}/tools/make/configure.libvpx.x86_64_mac_catalyst.sh ${BASEDIR}/src/${LIB_NAME}/build/make/configure.sh
+    ;;
    *)
        cp ${BASEDIR}/tools/make/configure.libvpx.all.sh ${BASEDIR}/src/${LIB_NAME}/build/make/configure.sh
    ;;
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libwebp"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="libxml2"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# ALWAYS RECONFIGURED
+# ALWAYS RECONFIGURE
 autoreconf_library ${LIB_NAME}

 ./configure \
@@ -58,7 +58,7 @@ autoreconf_library ${LIB_NAME}
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,15 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="mobile-ffmpeg"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
+if [ ${ARCH} == "x86-64-mac-catalyst" ]; then
+    BUILD_HOST="x86_64-apple-darwin"
+fi
 COMMON_CFLAGS=$(get_cflags ${LIB_NAME})
 COMMON_LDFLAGS=$(get_ldflags ${LIB_NAME})

@@ -52,7 +55,7 @@ make distclean 2>/dev/null 1>/dev/null

 rm -f ${BASEDIR}/ios/src/libmobileffmpeg* 1>>${BASEDIR}/build.log 2>&1

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_mobile_ffmpeg} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -76,7 +79,7 @@ ${SED_INLINE} 's/${wl}suppress//g' configure
    ${VIDEOTOOLBOX_SUPPORT_FLAG} \
    --disable-fast-install \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} 1>>${BASEDIR}/build.log 2>&1
+    --host=${BUILD_HOST} 1>>${BASEDIR}/build.log 2>&1

 if [ $? -ne 0 ]; then
    echo "failed"
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="nettle"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ case ${ARCH} in
    armv7 | armv7s | arm64 | arm64e)
        OPTIONAL_CPU_SUPPORT="--enable-arm-neon"
    ;;
-    i386 | x86-64)
+    i386 | x86-64 | x86-64-mac-catalyst)
        OPTIONAL_CPU_SUPPORT="--enable-x86-aesni"
    ;;
 esac
@@ -51,7 +51,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_nettle} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -69,7 +69,7 @@ fi
    --disable-gcov \
    --disable-documentation \
    ${OPTIONAL_CPU_SUPPORT} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,19 +27,19 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="opencore-amr"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})

 # OVERRIDE CXX
 case ${ARCH} in
-	x86-64)
+	x86-64 | x86-64-mac-catalyst)
 		export CXX="xcrun --sdk $(get_sdk_name) clang++ -arch x86_64"
 	;;
 	*)
@@ -51,7 +51,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_opencore_amr} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -64,7 +64,7 @@ fi
    --disable-shared \
    --disable-fast-install \
    --disable-maintainer-mode \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,16 +27,17 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="openh264"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})

+OS_OPTIONS="OS=ios"
 case ${ARCH} in
    armv7 | armv7s)
        CFLAGS+=" -DHAVE_NEON"
@@ -44,6 +45,10 @@ case ${ARCH} in
    arm64 | arm64e)
        CFLAGS+=" -DHAVE_NEON_AARCH64"
    ;;
+    x86-64-mac-catalyst)
+        OS_OPTIONS=""
+        CFLAGS+=" -DHAVE_AVX2"
+    ;;
    *)
        CFLAGS+=" -DHAVE_AVX2"
    ;;
@@ -51,13 +56,12 @@ esac

 cd ${BASEDIR}/src/${LIB_NAME} || exit 1

-# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES
+# MAKE SURE THAT ASM IS ENABLED FOR ALL IOS ARCHITECTURES - EXCEPT x86-64
 ${SED_INLINE} 's/arm64 aarch64/arm64% aarch64/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/%86 x86_64,/%86 x86_64 x86-64,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/filter-out arm64,/filter-out arm64%,/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/CFLAGS += -DHAVE_NEON/#CFLAGS += -DHAVE_NEON/g' ${BASEDIR}/src/${LIB_NAME}/build/arch.mk
 ${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm64)/ifneq (\$(filter arm64%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
-${SED_INLINE} 's/ifeq (\$(ASM_ARCH), x86)/ifneq (\$(filter %86 x86-64, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk
 ${SED_INLINE} 's/ifeq (\$(ASM_ARCH), arm)/ifneq (\$(filter armv%, \$(ASM_ARCH)),)/g' ${BASEDIR}/src/${LIB_NAME}/codec/common/targets.mk

 make clean 2>/dev/null 1>/dev/null
@@ -70,7 +74,7 @@ CFLAGS="$CFLAGS" \
 CXX="${CXX}" \
 CXXFLAGS="${CXXFLAGS}" \
 LDFLAGS="$LDFLAGS" \
-OS=ios \
+${OS_OPTIONS} \
 PREFIX="${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME}" \
 SDK_MIN="${IOS_MIN_VERSION}" \
 SDKROOT="${SDK_PATH}" \
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="opus"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_opus} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -60,7 +60,7 @@ fi
    --disable-maintainer-mode \
    --disable-doc \
    --disable-extra-programs \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+if [[ -z ${ARCH} ]]; then
+    echo -e "(*) ARCH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${TARGET_SDK} ]]; then
+    echo -e "(*) TARGET_SDK not defined\n"
+    exit 1
+fi
+
+if [[ -z ${SDK_PATH} ]]; then
+    echo -e "(*) SDK_PATH not defined\n"
+    exit 1
+fi
+
+if [[ -z ${BASEDIR} ]]; then
+    echo -e "(*) BASEDIR not defined\n"
+    exit 1
+fi
+
+# ENABLE COMMON FUNCTIONS
+if [[ ${APPLE_TVOS_BUILD} -eq 1 ]]; then
+    . ${BASEDIR}/build/tvos-common.sh
+else
+    . ${BASEDIR}/build/ios-common.sh
+fi
+
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
+LIB_NAME="rubberband"
+set_toolchain_clang_paths ${LIB_NAME}
+
+# PREPARING FLAGS
+BUILD_HOST=$(get_build_host)
+export CFLAGS=$(get_cflags ${LIB_NAME})
+export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
+export LDFLAGS=$(get_ldflags ${LIB_NAME})
+export PKG_CONFIG_LIBDIR=${INSTALL_PKG_CONFIG_DIR}
+
+cd ${BASEDIR}/src/${LIB_NAME} || exit 1
+
+make distclean 2>/dev/null 1>/dev/null
+
+# DISABLE OPTIONAL FEATURES MANUALLY, SINCE ./configure DOES NOT PROVIDE OPTIONS FOR THEM
+rm -f ${BASEDIR}/src/${LIB_NAME}/configure.ac
+cp ${BASEDIR}/tools/make/rubberband/configure.ac ${BASEDIR}/src/${LIB_NAME}/configure.ac
+rm -f ${BASEDIR}/src/${LIB_NAME}/Makefile.in
+cp ${BASEDIR}/tools/make/rubberband/Makefile.ios.in ${BASEDIR}/src/${LIB_NAME}/Makefile.in
+
+# FIX PACKAGE CONFIG FILE DEPENDENCIES
+rm -f ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+cp ${BASEDIR}/tools/make/rubberband/rubberband.pc.in ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+${SED_INLINE} 's/%DEPENDENCIES%/sndfile, samplerate/g' ${BASEDIR}/src/${LIB_NAME}/rubberband.pc.in
+
+# ALWAYS RECONFIGURE
+autoreconf_library ${LIB_NAME}
+
+# MANUALLY CREATE LIB DIRECTORY
+mkdir -p ${BASEDIR}/src/${LIB_NAME}/lib || exit 1
+
+./configure \
+    --prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME} \
+    --host=${BUILD_HOST} || exit 1
+
+make AR="$AR" -j$(get_cpu_count) || exit 1
+
+make install || exit 1
+
+# MANUALLY COPY PKG-CONFIG FILES
+cp ./*.pc ${INSTALL_PKG_CONFIG_DIR} || exit 1
@@ -27,22 +27,32 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="sdl"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"

+case ${ARCH} in
+    x86-64-mac-catalyst)
+        BUILD_HOST="x86_64-apple-macosx"
+        ARCH_OPTIONS="--disable-video-cocoa --disable-render-metal --disable-haptic --disable-diskaudio"
+    ;;
+    *)
+        ARCH_OPTIONS=""
+    ;;
+esac
+
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_sdl} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -59,7 +69,8 @@ cp ${BASEDIR}/tools/make/configure.sdl ${BASEDIR}/src/${LIB_NAME}/configure
    --enable-static \
    --disable-shared \
    --disable-video-opengl \
-    --host=${TARGET_HOST} || exit 1
+    ${ARCH_OPTIONS} \
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="shine"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_shine} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -53,7 +53,7 @@ fi
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="snappy"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS="$(get_cflags ${LIB_NAME}) -I${SDK_PATH}/usr/include"
 CXXFLAGS="$(get_cxxflags ${LIB_NAME})"
 LDFLAGS="$(get_ldflags ${LIB_NAME}) -L${SDK_PATH}/usr/lib"
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="soxr"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="speex"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -47,7 +47,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_speex} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -61,7 +61,7 @@ fi
    --disable-shared \
    --disable-binaries \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="tesseract"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ! -f ${BASEDIR}/src/${LIB_NAME}/configure ]] || [[ ${RECONF_tesseract} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -61,9 +61,10 @@ export LEPTONICA_LIBS="-L${BASEDIR}/prebuilt/$(get_target_build_directory)/lepto
    --disable-cube \
    --disable-tessdata-prefix \
    --disable-largefile \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

-${SED_INLINE} 's/$wl-bind_at_load//g' libtool
+${SED_INLINE} 's/$wl-bind_at_load//g' ${BASEDIR}/src/${LIB_NAME}/libtool
+${SED_INLINE} 's/-lrt//g' ${BASEDIR}/src/${LIB_NAME}/api/Makefile

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="tiff"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_tiff} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -59,7 +59,7 @@ fi
    --disable-cxx \
    --disable-win32-io \
    --disable-lzma \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="twolame"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -42,7 +42,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_twolame} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -57,7 +57,7 @@ export SNDFILE_LIBS="$(pkg-config --libs --static sndfile)"
    --enable-static \
    --disable-shared \
    --disable-fast-install \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="wavpack"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_wavpack} -eq 1 ]]; then
    autoreconf_library ${LIB_NAME}
 fi
@@ -67,7 +67,7 @@ esac
    --disable-apps \
    --disable-fast-install \
    --disable-tests \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -32,12 +32,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="x264"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -48,7 +48,7 @@ make distclean 2>/dev/null 1>/dev/null

 ASM_FLAGS=""
 case ${ARCH} in
-    i386 |x86-64)
+    i386 | x86-64 | x86-64-mac-catalyst)
        ASM_FLAGS="--disable-asm"

        if ! [ -x "$(command -v nasm)" ]; then
@@ -60,6 +60,10 @@ case ${ARCH} in
    ;;
 esac

+# DISABLE INLINE -arch DEFINITIONS
+${SED_INLINE} 's/CFLAGS=\"\$CFLAGS \-arch x86_64/CFLAGS=\"\$CFLAGS/g' configure
+${SED_INLINE} 's/LDFLAGS=\"\$LDFLAGS \-arch x86_64/LDFLAGS=\"\$CFLAGS/g' configure
+
 ./configure \
    --prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME} \
    --enable-pic \
@@ -67,7 +71,7 @@ esac
    --enable-static \
    ${ASM_FLAGS} \
    --disable-cli \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="x265"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 CFLAGS=$(get_cflags ${LIB_NAME})
 CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -46,16 +46,19 @@ if [[ ${DOWNLOAD_RESULT} -ne 0 ]]; then
 fi
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1

-ASM_OPTIONS=""
+ARCH_OPTIONS=""
 case ${ARCH} in
    armv7 | armv7s)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=1 -DCROSS_COMPILE_ARM=1"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=1 -DCROSS_COMPILE_ARM=1"
    ;;
    arm64 | arm64e)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=1"
+    ;;
+    x86-64-mac-catalyst)
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=0 -DCROSS_COMPILE_ARM=0"
    ;;
    *)
-        ASM_OPTIONS="-DENABLE_ASSEMBLY=1 -DCROSS_COMPILE_ARM=0"
+        ARCH_OPTIONS="-DENABLE_ASSEMBLY=1 -DCROSS_COMPILE_ARM=0"
    ;;
 esac

@@ -123,7 +126,7 @@ cmake -Wno-dev \
    -DSTATIC_LINK_CRT=1 \
    -DENABLE_PIC=1 \
    -DENABLE_CLI=0 \
-    ${ASM_OPTIONS} \
+    ${ARCH_OPTIONS} \
    -DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \
    -DENABLE_SHARED=0 ../source || exit 1

@@ -27,12 +27,12 @@ else
    . ${BASEDIR}/build/ios-common.sh
 fi

-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
+# PREPARE PATHS & DEFINE ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="xvidcore"
 set_toolchain_clang_paths ${LIB_NAME}

 # PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
+BUILD_HOST=$(get_build_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -41,7 +41,7 @@ cd ${BASEDIR}/src/${LIB_NAME}/build/generic || exit 1

 make distclean 2>/dev/null 1>/dev/null

-# RECONFIGURING IF REQUESTED
+# RECONFIGURE IF REQUESTED
 if [[ ${RECONF_xvidcore} -eq 1 ]]; then
    ./bootstrap.sh
 fi
@@ -60,7 +60,7 @@ case ${ARCH} in
        ${SED_INLINE} 's/-Wl,-read_only_relocs,suppress//g' configure

    ;;
-    i386 | x86-64)
+    i386 | x86-64 | x86-64-mac-catalyst)
        ASM_FLAGS="--disable-assembly"
    ;;
 esac
@@ -68,7 +68,7 @@ esac
 ./configure \
    --prefix=${BASEDIR}/prebuilt/$(get_target_build_directory)/${LIB_NAME} \
    ${ASM_FLAGS} \
-    --host=${TARGET_HOST} || exit 1
+    --host=${BUILD_HOST} || exit 1

 make -j$(get_cpu_count) || exit 1

@@ -72,8 +72,12 @@ check_if_dependency_rebuilt() {
            set_dependency_rebuilt_flag "leptonica"
            set_dependency_rebuilt_flag "tesseract"
        ;;
+        libsamplerate)
+            set_dependency_rebuilt_flag "rubberband"
+        ;;
        libsndfile)
            set_dependency_rebuilt_flag "twolame"
+            set_dependency_rebuilt_flag "rubberband"
        ;;
        libuuid)
            set_dependency_rebuilt_flag "fontconfig"
@@ -118,7 +122,7 @@ fi
 # FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
 # NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
 enabled_library_list=()
-for library in {1..42}
+for library in {1..44}
 do
    if [[ ${!library} -eq 1 ]]; then
        ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -197,6 +201,11 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                    run=1
                fi
            ;;
+            rubberband)
+                if [[ ! -z $OK_libsndfile ]] && [[ ! -z $OK_libsamplerate ]]; then
+                    run=1
+                fi
+            ;;
            tesseract)
                if [[ ! -z $OK_leptonica ]]; then
                    run=1
@@ -70,12 +70,12 @@ check_if_dependency_rebuilt() {
            set_dependency_rebuilt_flag "leptonica"
            set_dependency_rebuilt_flag "tesseract"
        ;;
+        libsamplerate)
+            set_dependency_rebuilt_flag "rubberband"
+        ;;
        libsndfile)
            set_dependency_rebuilt_flag "twolame"
-        ;;
-        libuuid)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
+            set_dependency_rebuilt_flag "rubberband"
        ;;
        libvorbis)
            set_dependency_rebuilt_flag "libtheora"
@@ -116,7 +116,7 @@ fi
 # FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
 # NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
 enabled_library_list=()
-for library in {1..41}
+for library in {1..42}
 do
    if [[ ${!library} -eq 1 ]]; then
        ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -133,7 +133,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
        let run=0
        case $library in
            fontconfig)
-                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]]; then
+                if [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]]; then
                    run=1
                fi
            ;;
@@ -153,7 +153,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                fi
            ;;
            libass)
-                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
+                if [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
                    run=1
                fi
            ;;
@@ -177,6 +177,11 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                    run=1
                fi
            ;;
+            rubberband)
+                if [[ ! -z $OK_libsndfile ]] && [[ ! -z $OK_libsamplerate ]]; then
+                    run=1
+                fi
+            ;;
            tesseract)
                if [[ ! -z $OK_leptonica ]]; then
                    run=1
@@ -229,7 +234,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do

                cd ${BASEDIR}

-                # BUILD EACH LIBRARY ALONE FIRST
+                # BUILD EACH LIBRARY ALONE
                ${SCRIPT_PATH} 1>>${BASEDIR}/build.log 2>&1

                if [ $? -eq 0 ]; then
@@ -70,12 +70,12 @@ check_if_dependency_rebuilt() {
            set_dependency_rebuilt_flag "leptonica"
            set_dependency_rebuilt_flag "tesseract"
        ;;
+        libsamplerate)
+            set_dependency_rebuilt_flag "rubberband"
+        ;;
        libsndfile)
            set_dependency_rebuilt_flag "twolame"
-        ;;
-        libuuid)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
+            set_dependency_rebuilt_flag "rubberband"
        ;;
        libvorbis)
            set_dependency_rebuilt_flag "libtheora"
@@ -116,7 +116,7 @@ fi
 # FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
 # NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
 enabled_library_list=()
-for library in {1..41}
+for library in {1..42}
 do
    if [[ ${!library} -eq 1 ]]; then
        ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -133,7 +133,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
        let run=0
        case $library in
            fontconfig)
-                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]]; then
+                if [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]]; then
                    run=1
                fi
            ;;
@@ -153,7 +153,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                fi
            ;;
            libass)
-                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
+                if [[ ! -z $OK_expat ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
                    run=1
                fi
            ;;
@@ -177,6 +177,11 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                    run=1
                fi
            ;;
+            rubberband)
+                if [[ ! -z $OK_libsndfile ]] && [[ ! -z $OK_libsamplerate ]]; then
+                    run=1
+                fi
+            ;;
            tesseract)
                if [[ ! -z $OK_leptonica ]]; then
                    run=1
@@ -229,7 +234,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do

                cd ${BASEDIR}

-                # BUILD EACH LIBRARY ALONE FIRST
+                # BUILD EACH LIBRARY ALONE
                ${SCRIPT_PATH} 1>>${BASEDIR}/build.log 2>&1

                if [ $? -eq 0 ]; then
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Taner Sener	99a6f18f5f	add create xcframework bundles option to ios.sh, fixes #351	2020-03-29 18:56:24 +01:00
Taner Sener	8af793fccb	fix parsing of unicode parameters on ios/tvos, fixes #360	2020-03-09 20:30:25 +00:00
Taner Sener	e5f9f72038	update rubber band build flags	2020-03-02 23:23:26 +00:00
Taner Sener	0baff685d7	support rubber band external library	2020-03-01 20:05:10 +00:00
Taner Sener	6d5cb88d0a	use system uuid library for tvos	2020-02-29 00:41:17 +00:00
Taner Sener	6fc1ed06c6	refactor system package function names in build scripts	2020-02-28 23:17:20 +00:00
Taner Sener	4c86999458	refactor ARCH_OPTIONS in build scripts	2020-02-28 23:11:48 +00:00
Taner Sener	95261c1ade	update libaom .gitignore	2020-02-28 22:03:22 +00:00
Taner Sener	ca0bb9fd0f	fix libaom linking error on mac catalyst	2020-02-28 20:07:21 +00:00
Taner Sener	12f52514b8	fix sdl linking error on mac catalyst	2020-02-28 07:47:33 +00:00
Taner Sener	64488a818a	disable asm for external libraries on mac catalyst	2020-02-25 22:52:55 +00:00
Taner Sener	c7e7cc20ef	fix mac catalyst build errors	2020-02-25 19:55:22 +00:00
Taner Sener	efe1c59a20	use build host and target host in build scripts	2020-02-24 21:24:58 +00:00
Taner Sener	4605e778c5	update mac catalyst arch name	2020-02-24 00:29:20 +00:00
Taner Sener	ec851d33a3	disable asm for ffmpeg on x86-64h	2020-02-23 19:21:24 +00:00
Taner Sener	b5565bd359	disable asm for x265 on x86-64h	2020-02-23 18:37:29 +00:00
Taner Sener	9229cf50c4	use system uuid library for ios	2020-02-23 14:12:43 +00:00
Taner Sener	7cf14d21e4	add mac catalyst support	2020-02-23 09:22:16 +00:00
Taner Sener	4e92d550fd	fix travis builds	2020-02-16 15:38:02 +00:00
Taner Sener	1157681271	fix travis ios builds	2020-02-15 23:18:23 +00:00
Taner Sener	78e5411df9	update SIMD_OPTIONS as ARCH_OPTIONS	2020-02-15 22:20:51 +00:00