mirror of
https://github.com/levogevo/ffmpeg-builder.git
synced 2026-01-15 19:06:17 +00:00
fix patch
This commit is contained in:
12
lib/build.sh
12
lib/build.sh
@@ -34,8 +34,12 @@ set_compile_opts() {
|
|||||||
"-DCMAKE_PREFIX_PATH=${PREFIX}"
|
"-DCMAKE_PREFIX_PATH=${PREFIX}"
|
||||||
"-DCMAKE_INSTALL_PREFIX=${PREFIX}"
|
"-DCMAKE_INSTALL_PREFIX=${PREFIX}"
|
||||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||||
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
)
|
)
|
||||||
|
CARGO_BUILD_TYPE=release
|
||||||
|
CARGO_FLAGS+=("--${CARGO_BUILD_TYPE}")
|
||||||
CARGO_CINSTALL_FLAGS=(
|
CARGO_CINSTALL_FLAGS=(
|
||||||
|
"--${CARGO_BUILD_TYPE}"
|
||||||
"--prefix" "${PREFIX}"
|
"--prefix" "${PREFIX}"
|
||||||
"--libdir" "${LIBDIR}"
|
"--libdir" "${LIBDIR}"
|
||||||
)
|
)
|
||||||
@@ -59,17 +63,13 @@ set_compile_opts() {
|
|||||||
fi
|
fi
|
||||||
MESON_FLAGS+=("-Db_lto=true")
|
MESON_FLAGS+=("-Db_lto=true")
|
||||||
RUSTFLAGS+=("-C lto=yes" "-C inline-threshold=1000" "-C codegen-units=1")
|
RUSTFLAGS+=("-C lto=yes" "-C inline-threshold=1000" "-C codegen-units=1")
|
||||||
CARGO_BUILD_TYPE=release
|
|
||||||
CARGO_FLAGS+=("--${CARGO_BUILD_TYPE}")
|
|
||||||
else
|
else
|
||||||
echo_info "building without LTO"
|
echo_info "building without LTO"
|
||||||
LTO_SWITCH='OFF'
|
LTO_SWITCH='OFF'
|
||||||
LTO_FLAG=''
|
LTO_FLAG=''
|
||||||
MESON_FLAGS+=("-Db_lto=false")
|
MESON_FLAGS+=("-Db_lto=false")
|
||||||
RUSTFLAGS+=("-C lto=no")
|
RUSTFLAGS+=("-C lto=no")
|
||||||
CARGO_BUILD_TYPE=debug
|
|
||||||
fi
|
fi
|
||||||
CARGO_CINSTALL_FLAGS+=("--${CARGO_BUILD_TYPE}")
|
|
||||||
|
|
||||||
# setting optimization level
|
# setting optimization level
|
||||||
if [[ ${OPT} == '' ]]; then
|
if [[ ${OPT} == '' ]]; then
|
||||||
@@ -461,7 +461,6 @@ build_cpuinfo() {
|
|||||||
build_libsvtav1() {
|
build_libsvtav1() {
|
||||||
cmake \
|
cmake \
|
||||||
"${CMAKE_FLAGS[@]}" \
|
"${CMAKE_FLAGS[@]}" \
|
||||||
-DSVT_AV1_LTO="${LTO_SWITCH}" \
|
|
||||||
-DENABLE_AVX512=ON \
|
-DENABLE_AVX512=ON \
|
||||||
-DBUILD_TESTING=OFF \
|
-DBUILD_TESTING=OFF \
|
||||||
-DCOVERAGE=OFF || return 1
|
-DCOVERAGE=OFF || return 1
|
||||||
@@ -474,7 +473,6 @@ build_libsvtav1_psy() {
|
|||||||
local dovilib="$(find -L "${PREFIX}" -type f -name "libdovi.${USE_LIB_SUFF}")"
|
local dovilib="$(find -L "${PREFIX}" -type f -name "libdovi.${USE_LIB_SUFF}")"
|
||||||
cmake \
|
cmake \
|
||||||
"${CMAKE_FLAGS[@]}" \
|
"${CMAKE_FLAGS[@]}" \
|
||||||
-DSVT_AV1_LTO="${LTO_SWITCH}" \
|
|
||||||
-DBUILD_TESTING=OFF \
|
-DBUILD_TESTING=OFF \
|
||||||
-DENABLE_AVX512=ON \
|
-DENABLE_AVX512=ON \
|
||||||
-DCOVERAGE=OFF \
|
-DCOVERAGE=OFF \
|
||||||
@@ -611,7 +609,7 @@ build_ffmpeg() {
|
|||||||
ffmpegFlags+=("${flag}")
|
ffmpegFlags+=("${flag}")
|
||||||
done
|
done
|
||||||
for flag in "${FFMPEG_EXTRA_FLAGS[@]}"; do
|
for flag in "${FFMPEG_EXTRA_FLAGS[@]}"; do
|
||||||
ffmpegFlags+=("${flag// -flto/}")
|
ffmpegFlags+=("${flag// ${LTO_FLAG}/}")
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
ffmpegFlags=("${CONFIGURE_FLAGS[@]}" "${FFMPEG_EXTRA_FLAGS[@]}")
|
ffmpegFlags=("${CONFIGURE_FLAGS[@]}" "${FFMPEG_EXTRA_FLAGS[@]}")
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ print_req_pkgs() {
|
|||||||
"${common_linux_pkgs[@]}" openssl-devel
|
"${common_linux_pkgs[@]}" openssl-devel
|
||||||
pipx ninja-build fontconfig-devel wget2
|
pipx ninja-build fontconfig-devel wget2
|
||||||
cpuinfo-devel glibc-static glibc-devel
|
cpuinfo-devel glibc-static glibc-devel
|
||||||
libstdc++-static libstdc++-devel
|
libstdc++-static libstdc++-devel patch
|
||||||
)
|
)
|
||||||
|
|
||||||
local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs"
|
local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs"
|
||||||
|
|||||||
2
main.sh
2
main.sh
@@ -76,7 +76,7 @@ set_completions() {
|
|||||||
test -f "${HOME}/.bashrc" && source "${HOME}/.bashrc"
|
test -f "${HOME}/.bashrc" && source "${HOME}/.bashrc"
|
||||||
src_scripts || return 1
|
src_scripts || return 1
|
||||||
determine_pkg_mgr || return 1
|
determine_pkg_mgr || return 1
|
||||||
check_compile_opts_override || return
|
check_compile_opts_override || return 1
|
||||||
|
|
||||||
if [[ $FB_RUNNING_AS_SCRIPT -eq 0 ]]; then
|
if [[ $FB_RUNNING_AS_SCRIPT -eq 0 ]]; then
|
||||||
print_cmds || return 1
|
print_cmds || return 1
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ base="$(dirname "$(readlink -f "$0")")"
|
|||||||
inotifywait -m -r \
|
inotifywait -m -r \
|
||||||
-e close_write \
|
-e close_write \
|
||||||
-e moved_to \
|
-e moved_to \
|
||||||
--format '%w%f' "$base/lib" "$base/scripts" | while read -r file; do
|
--format '%w%f' \
|
||||||
|
"$base/lib" \
|
||||||
|
"$base/scripts" \
|
||||||
|
"$base/main.sh" | while read -r file; do
|
||||||
if [[ -f $file && $file =~ .sh ]]; then
|
if [[ -f $file && $file =~ .sh ]]; then
|
||||||
shfmt --write --simplify "$file"
|
shfmt --write --simplify "$file"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user