diff --git a/build/main-tvos.sh b/build/main-tvos.sh
index 38f57dae4..ac9abb2c6 100755
--- a/build/main-tvos.sh
+++ b/build/main-tvos.sh
@@ -73,10 +73,6 @@ check_if_dependency_rebuilt() {
         libsndfile)
             set_dependency_rebuilt_flag "twolame"
         ;;
-        libuuid)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
         libvorbis)
             set_dependency_rebuilt_flag "libtheora"
         ;;
@@ -116,7 +112,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..40}
 do
     if [[ ${!library} -eq 1 ]]; then
         ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -133,7 +129,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 +149,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
             ;;
@@ -229,7 +225,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
diff --git a/build/tvos-common.sh b/build/tvos-common.sh
index 76a92dacd..1ddc21030 100755
--- a/build/tvos-common.sh
+++ b/build/tvos-common.sh
@@ -53,18 +53,18 @@ get_library_name() {
         32) echo "jpeg" ;;
         33) echo "libogg" ;;
         34) echo "libpng" ;;
-        35) echo "libuuid" ;;
-        36) echo "nettle" ;;
-        37) echo "tiff" ;;
-        38) echo "expat" ;;
-        39) echo "libsndfile" ;;
-        40) echo "leptonica" ;;
-        41) echo "tvos-zlib" ;;
-        42) echo "tvos-audiotoolbox" ;;
-        43) echo "tvos-coreimage" ;;
-        44) echo "tvos-bzip2" ;;
-        45) echo "tvos-videotoolbox" ;;
-        46) echo "tvos-libiconv" ;;
+        35) echo "nettle" ;;
+        36) echo "tiff" ;;
+        37) echo "expat" ;;
+        38) echo "libsndfile" ;;
+        39) echo "leptonica" ;;
+        40) echo "tvos-zlib" ;;
+        41) echo "tvos-audiotoolbox" ;;
+        42) echo "tvos-coreimage" ;;
+        43) echo "tvos-bzip2" ;;
+        44) echo "tvos-videotoolbox" ;;
+        45) echo "tvos-libiconv" ;;
+        46) echo "tvos-libuuid" ;;
     esac
 }
 
@@ -83,10 +83,10 @@ get_package_config_file_name() {
         28) echo "sdl2" ;;
         32) echo "libjpeg" ;;
         33) echo "ogg" ;;
-        35) echo "uuid" ;;
-        37) echo "libtiff-4" ;;
-        39) echo "sndfile" ;;
-        40) echo "lept" ;;
+        36) echo "libtiff-4" ;;
+        38) echo "sndfile" ;;
+        39) echo "lept" ;;
+        46) echo "uuid" ;;
         *) echo $(get_library_name $1)
     esac
 }
@@ -110,9 +110,8 @@ get_static_archive_name() {
         31) echo "libgif.a" ;;
         33) echo "libogg.a" ;;
         34) echo "libpng.a" ;;
-        35) echo "libuuid.a" ;;
-        39) echo "libsndfile.a" ;;
-        40) echo "liblept.a" ;;
+        38) echo "libsndfile.a" ;;
+        39) echo "liblept.a" ;;
         *) echo lib$(get_library_name $1).a
     esac
 }
@@ -773,13 +772,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
@@ -787,7 +786,7 @@ Description: Universally unique id library
 Version: ${UUID_VERSION}
 Requires:
 Cflags: -I\${includedir}
-Libs: -L\${libdir} -luuid
+Libs: -L\${libdir}
 EOF
 }
 
@@ -1030,6 +1029,7 @@ 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}
@@ -1047,6 +1047,10 @@ set_toolchain_clang_paths() {
         create_bzip2_system_package_config
     fi
 
+    if [ ! -f ${LIB_UUID_PACKAGE_CONFIG_PATH} ]; then
+        create_libuuid_system_package_config
+    fi
+
     prepare_inline_sed
 }
 
diff --git a/tools/release/ios/mobile-ffmpeg-full-gpl.podspec b/tools/release/ios/mobile-ffmpeg-full-gpl.podspec
index 41cbf4d63..ea6a94252 100644
--- a/tools/release/ios/mobile-ffmpeg-full-gpl.podspec
+++ b/tools/release/ios/mobile-ffmpeg-full-gpl.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
     s.ios.deployment_target = '9.3'
     s.ios.frameworks    = 'AudioToolbox','AVFoundation','CoreMedia','VideoToolbox'
-    s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libuuid.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework', 'libvidstab.framework', 'x264.framework', 'x265.framework', 'xvidcore.framework'
+    s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework', 'libvidstab.framework', 'x264.framework', 'x265.framework', 'xvidcore.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-full.podspec b/tools/release/ios/mobile-ffmpeg-full.podspec
index a9243ffec..7b3b53ff8 100644
--- a/tools/release/ios/mobile-ffmpeg-full.podspec
+++ b/tools/release/ios/mobile-ffmpeg-full.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
     s.ios.deployment_target = '9.3'
     s.ios.frameworks    = 'AudioToolbox','AVFoundation','CoreMedia','VideoToolbox'
-    s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libuuid.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework'
+    s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework'
 
 end  
diff --git a/tools/release/ios/mobile-ffmpeg-video.podspec b/tools/release/ios/mobile-ffmpeg-video.podspec
index ec05a2774..9acfb7731 100644
--- a/tools/release/ios/mobile-ffmpeg-video.podspec
+++ b/tools/release/ios/mobile-ffmpeg-video.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
     s.ios.deployment_target = '9.3'
     s.ios.frameworks    = 'AudioToolbox','AVFoundation','CoreMedia','VideoToolbox'
-    s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'jpeg.framework', 'kvazaar.framework', 'libaom.framework', 'libass.framework', 'libogg.framework', 'libpng.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libuuid.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'snappy.framework', 'tiff.framework'
+    s.ios.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'jpeg.framework', 'kvazaar.framework', 'libaom.framework', 'libass.framework', 'libogg.framework', 'libpng.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'snappy.framework', 'tiff.framework'
 
 end  
diff --git a/tools/release/tvos/mobile-ffmpeg-tvos-full-gpl.podspec b/tools/release/tvos/mobile-ffmpeg-tvos-full-gpl.podspec
index a76d14f89..d181bda00 100644
--- a/tools/release/tvos/mobile-ffmpeg-tvos-full-gpl.podspec
+++ b/tools/release/tvos/mobile-ffmpeg-tvos-full-gpl.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
     s.tvos.deployment_target = '9.2'
     s.tvos.frameworks   = 'AudioToolbox','VideoToolbox','CoreMedia'
-    s.tvos.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libuuid.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework', 'libvidstab.framework', 'x264.framework', 'x265.framework', 'xvidcore.framework'
+    s.tvos.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework', 'libvidstab.framework', 'x264.framework', 'x265.framework', 'xvidcore.framework'
 
 end  
diff --git a/tools/release/tvos/mobile-ffmpeg-tvos-full.podspec b/tools/release/tvos/mobile-ffmpeg-tvos-full.podspec
index edffc3db8..893130614 100644
--- a/tools/release/tvos/mobile-ffmpeg-tvos-full.podspec
+++ b/tools/release/tvos/mobile-ffmpeg-tvos-full.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
     s.tvos.deployment_target = '9.2'
     s.tvos.frameworks   = 'AudioToolbox','VideoToolbox','CoreMedia'
-    s.tvos.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libuuid.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework'
+    s.tvos.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'gmp.framework', 'gnutls.framework', 'jpeg.framework', 'kvazaar.framework', 'lame.framework', 'libaom.framework', 'libass.framework', 'libhogweed.framework', 'libilbc.framework', 'libnettle.framework', 'libogg.framework', 'libopencore-amrnb.framework', 'libopencore-amrwb.framework', 'libpng.framework', 'libsndfile.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'libxml2.framework', 'opus.framework', 'shine.framework', 'snappy.framework', 'soxr.framework', 'speex.framework', 'tiff.framework', 'twolame.framework', 'wavpack.framework'
 
 end  
diff --git a/tools/release/tvos/mobile-ffmpeg-tvos-video.podspec b/tools/release/tvos/mobile-ffmpeg-tvos-video.podspec
index 5412986cc..382a9dc1f 100644
--- a/tools/release/tvos/mobile-ffmpeg-tvos-video.podspec
+++ b/tools/release/tvos/mobile-ffmpeg-tvos-video.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
     s.tvos.deployment_target = '9.2'
     s.tvos.frameworks   = 'AudioToolbox','VideoToolbox','CoreMedia'
-    s.tvos.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'jpeg.framework', 'kvazaar.framework', 'libaom.framework', 'libass.framework', 'libogg.framework', 'libpng.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libuuid.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'snappy.framework', 'tiff.framework'
+    s.tvos.vendored_frameworks = 'mobileffmpeg.framework', 'libavcodec.framework', 'libavdevice.framework', 'libavfilter.framework', 'libavformat.framework', 'libavutil.framework', 'libswresample.framework', 'libswscale.framework', 'expat.framework', 'fontconfig.framework', 'freetype.framework', 'fribidi.framework', 'giflib.framework', 'jpeg.framework', 'kvazaar.framework', 'libaom.framework', 'libass.framework', 'libogg.framework', 'libpng.framework', 'libtheora.framework', 'libtheoradec.framework', 'libtheoraenc.framework', 'libvorbis.framework', 'libvorbisenc.framework', 'libvorbisfile.framework', 'libvpx.framework', 'libwebp.framework', 'libwebpdecoder.framework', 'libwebpdemux.framework', 'snappy.framework', 'tiff.framework'
 
 end  
diff --git a/tvos.sh b/tvos.sh
index c102e6812..9e70af2a1 100755
--- a/tvos.sh
+++ b/tvos.sh
@@ -40,18 +40,18 @@ LIBRARY_GIFLIB=31
 LIBRARY_JPEG=32
 LIBRARY_LIBOGG=33
 LIBRARY_LIBPNG=34
-LIBRARY_LIBUUID=35
-LIBRARY_NETTLE=36
-LIBRARY_TIFF=37
-LIBRARY_EXPAT=38
-LIBRARY_SNDFILE=39
-LIBRARY_LEPTONICA=40
-LIBRARY_ZLIB=41
-LIBRARY_AUDIOTOOLBOX=42
-LIBRARY_COREIMAGE=43
-LIBRARY_BZIP2=44
-LIBRARY_VIDEOTOOLBOX=45
-LIBRARY_LIBICONV=46
+LIBRARY_NETTLE=35
+LIBRARY_TIFF=36
+LIBRARY_EXPAT=37
+LIBRARY_SNDFILE=38
+LIBRARY_LEPTONICA=39
+LIBRARY_ZLIB=40
+LIBRARY_AUDIOTOOLBOX=41
+LIBRARY_COREIMAGE=42
+LIBRARY_BZIP2=43
+LIBRARY_VIDEOTOOLBOX=44
+LIBRARY_LIBICONV=45
+LIBRARY_LIBUUID=46
 
 # ENABLE ARCH
 ENABLED_ARCHITECTURES=(1 1)
@@ -218,7 +218,7 @@ reconf_library() {
     local RECONF_VARIABLE=$(echo "RECONF_$1" | sed "s/\-/\_/g")
     local library_supported=0
 
-    for library in {1..41}
+    for library in {1..40}
     do
         library_name=$(get_library_name $((library - 1)))
 
@@ -238,7 +238,7 @@ rebuild_library() {
     local REBUILD_VARIABLE=$(echo "REBUILD_$1" | sed "s/\-/\_/g")
     local library_supported=0
 
-    for library in {1..41}
+    for library in {1..40}
     do
         library_name=$(get_library_name $((library - 1)))
 
@@ -278,6 +278,9 @@ set_library() {
         tvos-libiconv)
             ENABLED_LIBRARIES[LIBRARY_LIBICONV]=$2
         ;;
+        tvos-libuuid)
+            ENABLED_LIBRARIES[LIBRARY_LIBUUID]=$2
+        ;;
         chromaprint)
             ENABLED_LIBRARIES[LIBRARY_CHROMAPRINT]=$2
         ;;
@@ -487,7 +490,7 @@ print_enabled_libraries() {
     let enabled=0;
 
     # FIRST BUILT-IN LIBRARIES
-    for library in {41..46}
+    for library in {40..46}
     do
         if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
             if [[ ${enabled} -ge 1 ]]; then
@@ -669,9 +672,9 @@ get_external_library_license_path() {
         26) echo "${BASEDIR}/src/$(get_library_name $1)/LICENSE.md" ;;
         28) echo "${BASEDIR}/src/$(get_library_name $1)/COPYING.txt" ;;
         32) echo "${BASEDIR}/src/$(get_library_name $1)/LICENSE.md " ;;
-        36) echo "${BASEDIR}/src/$(get_library_name $1)/COPYING.LESSERv3" ;;
-        37) echo "${BASEDIR}/src/$(get_library_name $1)/COPYRIGHT" ;;
-        40) echo "${BASEDIR}/src/$(get_library_name $1)/leptonica-license.txt" ;;
+        35) echo "${BASEDIR}/src/$(get_library_name $1)/COPYING.LESSERv3" ;;
+        36) echo "${BASEDIR}/src/$(get_library_name $1)/COPYRIGHT" ;;
+        39) echo "${BASEDIR}/src/$(get_library_name $1)/leptonica-license.txt" ;;
         4 | 9 | 12 | 18 | 20 | 25 | 30 | 34) echo "${BASEDIR}/src/$(get_library_name $1)/LICENSE" ;;
         *) echo "${BASEDIR}/src/$(get_library_name $1)/COPYING" ;;
     esac
@@ -872,7 +875,7 @@ if [[ ! -z ${TARGET_ARCH_LIST} ]]; then
     mkdir -p ${BASEDIR}/prebuilt/tvos-framework 1>>${BASEDIR}/build.log 2>&1
 
     # 1. EXTERNAL LIBRARIES
-    for library in {0..40}
+    for library in {0..39}
     do
         if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then