diff --git a/README.md b/README.md index 47f9de5..d7143d7 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,37 @@ Configuration is done through environment variables. By default, this project will build a static `ffmpeg` binary in `./gitignore/sysroot/bin/ffmpeg`. The user-overridable compile options are: -- `ENABLE`: configure what ffmpeg enables (default: libaom libass libvpx libxml2 libvmaf libx264 libx265 libwebp libopus librav1e libdav1d libvorbis libmp3lame libfribidi libfreetype libharfbuzz libopenjpeg libsvtav1_hdr libfontconfig ) +- `ENABLE`: configure what ffmpeg enables (default: +lcms2 +libaom +libass +libvpx +libjxl +libxml2 +libvmaf +libx264 +libx265 +libwebp +libopus +librav1e +libdav1d +libbluray +libsnappy +libvorbis +libmp3lame +libfribidi +libfreetype +libharfbuzz +libopenjpeg +libsvtav1_hdr +libfontconfig +) - `PREFIX`: prefix to install to, default is local install in ./gitignore/sysroot (default: local) - `STATIC`: static or shared build (default: ON) - `LTO`: enable link time optimization (default: ON) - `CLEAN`: clean build directories before building (default: ON) - `PGO`: enable profile guided optimization (default: OFF) +- `PACKAGE`: package ffmpeg binaries to tarball in ./gitignore/package (default: OFF) - `ARCH`: architecture type (x86-64-v{1,2,3,4}, armv8-a, etc) (default: native) - `OPT`: optimization level (0-3) (default: 3) diff --git a/lib/build.sh b/lib/build.sh index b1116d7..0d129b5 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -705,9 +705,10 @@ build() { local ffmpeg="$(command -v ffmpeg 2>/dev/null)" if [[ ${ffmpeg} != "${ffmpegBin}" ]]; then echo - echo_warn "ffmpeg in path (${ffmpeg}) is not the built one (${ffmpegBin})" - echo_info "consider adding ${BINDIR} to \$PATH" - echo "echo 'export PATH=\"${BINDIR}:\$PATH\"' >> ~/.bashrc" + echo_warn "ffmpeg in PATH (${ffmpeg}) is not the built one (${ffmpegBin})" + local homeAwareBin="${BINDIR//${HOME}/\$HOME}" + echo_info "consider adding ${homeAwareBin} to \$PATH" + echo "echo 'export PATH=\"${homeAwareBin}:\$PATH\"' >> ~/.bashrc" fi package || return 1