disable unneeded stuff

beeper · Mar 28, 2023 · b288054 · b288054
1 parent 47f85fa
commit b288054
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh
@@ -514,7 +514,6 @@ ${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR
   --enable-pic \
   --enable-inline-asm \
   --enable-optimizations \
-  --enable-swscale \
   ${BUILD_LIBRARY_OPTIONS} \
   --enable-pthreads \
   --disable-v4l2-m2m \
@@ -548,6 +547,11 @@ ${SED_INLINE} 's/static int av_log_level/__thread int av_log_level/g' "${BASEDIR
   --disable-nvenc \
   --disable-vaapi \
   --disable-vdpau \
+  --disable-everything \
+  --enable-decoder=libvpx_vp9 \
+  --enable-encoder=libwebp_anim \
+  --enable-muxer=webp \
+  --enable-protocol=file \
   ${CONFIGURE_POSTFIX} 1>>"${BASEDIR}"/build.log 2>&1
 
 if [[ $? -ne 0 ]]; then

diff --git a/scripts/apple/libvpx.sh b/scripts/apple/libvpx.sh
@@ -66,9 +66,8 @@ esac
   --enable-pic \
   --enable-optimizations \
   --enable-better-hw-compatibility \
-  --enable-vp9-highbitdepth \
   ${ASM_OPTIONS} \
-  --enable-vp8 \
+  --disable-vp8 \
   --enable-vp9 \
   --enable-multithread \
   --enable-spatial-resampling \

diff --git a/scripts/apple/libwebp.sh b/scripts/apple/libwebp.sh
@@ -31,14 +31,6 @@ fi
   --disable-dependency-tracking \
   --enable-libwebpmux \
   ${ASM_OPTIONS} \
-  --with-pngincludedir="${LIB_INSTALL_BASE}/libpng/include" \
-  --with-pnglibdir="${LIB_INSTALL_BASE}/libpng/lib" \
-  --with-jpegincludedir="${LIB_INSTALL_BASE}/jpeg/include" \
-  --with-jpeglibdir="${LIB_INSTALL_BASE}/jpeg/lib" \
-  --with-gifincludedir="${LIB_INSTALL_BASE}/giflib/include" \
-  --with-giflibdir="${LIB_INSTALL_BASE}/giflib/lib" \
-  --with-tiffincludedir="${LIB_INSTALL_BASE}/tiff/include" \
-  --with-tifflibdir="${LIB_INSTALL_BASE}/tiff/lib" \
   --host="${HOST}" || return 1
 
 make -j$(get_cpu_count) || return 1

diff --git a/scripts/function.sh b/scripts/function.sh
@@ -1171,10 +1171,6 @@ set_library() {
     ;;
   libwebp)
     ENABLED_LIBRARIES[LIBRARY_LIBWEBP]=$2
-    ENABLED_LIBRARIES[LIBRARY_GIFLIB]=$2
-    ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
-    set_library "tiff" $2
-    set_library "libpng" $2
     ;;
   libxml2)
     ENABLED_LIBRARIES[LIBRARY_LIBXML2]=$2
@@ -1461,6 +1457,7 @@ check_if_dependency_rebuilt() {
   case $1 in
   cpu-features)
     set_dependency_rebuilt_flag "libvpx"
+    set_dependency_rebuilt_flag "libwebp"
     set_dependency_rebuilt_flag "openh264"
     ;;
   expat)
@@ -1479,9 +1476,6 @@ check_if_dependency_rebuilt() {
     set_dependency_rebuilt_flag "libass"
     ;;
   giflib)
-    set_dependency_rebuilt_flag "libwebp"
-    set_dependency_rebuilt_flag "leptonica"
-    set_dependency_rebuilt_flag "tesseract"
     ;;
   gmp)
     set_dependency_rebuilt_flag "gnutls"
@@ -1492,7 +1486,6 @@ check_if_dependency_rebuilt() {
     ;;
   jpeg)
     set_dependency_rebuilt_flag "tiff"
-    set_dependency_rebuilt_flag "libwebp"
     set_dependency_rebuilt_flag "leptonica"
     set_dependency_rebuilt_flag "tesseract"
     ;;
@@ -1512,7 +1505,6 @@ check_if_dependency_rebuilt() {
     ;;
   libpng)
     set_dependency_rebuilt_flag "freetype"
-    set_dependency_rebuilt_flag "libwebp"
     set_dependency_rebuilt_flag "libass"
     set_dependency_rebuilt_flag "leptonica"
     set_dependency_rebuilt_flag "tesseract"
@@ -1542,7 +1534,6 @@ check_if_dependency_rebuilt() {
     set_dependency_rebuilt_flag "srt"
     ;;
   tiff)
-    set_dependency_rebuilt_flag "libwebp"
     set_dependency_rebuilt_flag "leptonica"
     set_dependency_rebuilt_flag "tesseract"
     ;;

diff --git a/scripts/main-ios.sh b/scripts/main-ios.sh
@@ -38,6 +38,9 @@ enabled_library_list=()
 for library in {1..50}; do
   if [[ ${!library} -eq 1 ]]; then
     ENABLED_LIBRARY=$(get_library_name $((library - 1)))
+    if [ "${ENABLED_LIBRARY}" = "giflib" ] || [ "${ENABLED_LIBRARY}" = "jpeg" ] || [ "${ENABLED_LIBRARY}" = "libpng" ] || [ "${ENABLED_LIBRARY}" = "tiff" ]; then
+      continue
+    fi
     enabled_library_list+=(${ENABLED_LIBRARY})
 
     echo -e "INFO: Enabled library ${ENABLED_LIBRARY} will be built\n" 1>>"${BASEDIR}"/build.log 2>&1
@@ -91,9 +94,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
       fi
       ;;
     libwebp)
-      if [[ $OK_giflib -eq 1 ]] && [[ $OK_jpeg -eq 1 ]] && [[ $OK_libpng -eq 1 ]] && [[ $OK_tiff -eq 1 ]]; then
-        run=1
-      fi
+      run=1
       ;;
     nettle)
       if [[ $OK_gmp -eq 1 ]]; then