diff --git a/lib/build.sh b/lib/build.sh index 5762e4e..85bc5c7 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -487,6 +487,9 @@ build() { # darwin will always link dynamically if a dylib is present # so they must be remove for static builds sanitize_sysroot_libs() { + # do nothing for windows + if is_windows; then return ; fi + local libs=("$@") for lib in "${libs[@]}"; do @@ -575,6 +578,7 @@ cmake_build() { # build cmake \ --build fb-build \ + --config Release \ -j "${JOBS}" || return 1 # install ${SUDO_MODIFY} cmake \ @@ -599,16 +603,12 @@ build_libsvtav1() { } build_libsvtav1_psy() { - local hdr10pluslib="${LIBDIR}/libhdr10plus-rs.${USE_LIB_SUFF}" - local dovilib="${LIBDIR}/libdovi.${USE_LIB_SUFF}" cmake_build \ -DBUILD_TESTING=OFF \ -DENABLE_AVX512=ON \ -DCOVERAGE=OFF \ -DLIBDOVI_FOUND=1 \ - -DLIBHDR10PLUS_RS_FOUND=1 \ - -DLIBHDR10PLUS_RS_LIBRARY="${hdr10pluslib}" \ - -DLIBDOVI_LIBRARY="${dovilib}" || return 1 + -DLIBHDR10PLUS_RS_FOUND=1 || return 1 sanitize_sysroot_libs libSvtAv1Enc || return 1 } diff --git a/lib/install_deps.sh b/lib/install_deps.sh index 7bb3db9..2df0bab 100644 --- a/lib/install_deps.sh +++ b/lib/install_deps.sh @@ -91,6 +91,21 @@ print_req_pkgs() { zip unzip gperf build-essential binutils ninja ndk-multilib-native-static ) + # shellcheck disable=SC2034 + local winget_pkgs=( + Git.Git gerardog.gsudo + StrawberryPerl.StrawberryPerl + bloodrock.pkg-config-lite + Kitware.CMake mesonbuild.meson + Microsoft.VisualStudio.2019.BuildTools + Microsoft.VisualStudio.2022.BuildTools + GnuWin32.DiffUtils GnuWin32.Bison + GnuWin32.Gperf GnuWin32.File + GnuWin32.Tar GnuWin32.UnZip + GnuWin32.Zip GnuWin32.Which + Rustlang.Rustup Python.Python.3.12 + Ccache.Ccache LLVM.LLVM + ) local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs" declare -n req_pkgs="${req_pkgs_env_name}" diff --git a/lib/readme.sh b/lib/readme.sh index e63e6f1..70006ef 100644 --- a/lib/readme.sh +++ b/lib/readme.sh @@ -106,34 +106,42 @@ $(efg) Example usage: - \`efg -i input.mkv -p\` \`\`\` - 1 +------------------------------------------------------------------------------------------------------+ - | *****G***** + + + | - | *****G** '/tmp/plot.dat' ***G*** | - 0.95 |-+ ***** +-| - | **G* | - | *** | - | **** | - 0.9 |-+ *G* +-| - | **** | - | **** | - 0.85 |-+ *G* +-| - | *** | - | **** | - 0.8 |-+ *G* +-| - | *** | - | **** | - | *G* | - 0.75 |-+ *** +-| - | **** | - | *G* | - 0.7 |-+ *** +-| - | ** | - | *** | - | *G* | - 0.65 |-+ *** +-| - | **** | - | + + + *| - 0.6 +------------------------------------------------------------------------------------------------------+ + 10000 +------------------------------------------------------------------------------------------------------------------------------------------+ + | **G* + + + + + | + | ** "/Volumes/External/ffmpeg-builder/gitignore/tmp/efg-matrix-reloaded.mkv/plot.dat" ***G*** | + | *G** | + | **G | + 9000 |-+ ** +-| + | *G** | + | **G | + | ** | + | *G* | + 8000 |-+ ** +-| + | *G** | + | **G | + | ** | + | *G** | + 7000 |-+ **G* +-| + | ** | + | *G* | + | **G** | + 6000 |-+ **G* +-| + | ** | + | *G* | + | **G** | + | **G* | + 5000 |-+ **G** +-| + | **G****G* | + | **G** | + | **G****G* | + | **G****G* | + 4000 |-+ **G****G****G* +-| + | **G****| + | | + | | + | + + + + + | + 3000 +------------------------------------------------------------------------------------------------------------------------------------------+ + 0 5 10 15 20 25 30 \`\`\` " >"${readme}"