Skip to content

Merge from forked #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 28, 2022
Merged

Merge from forked #1

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
33ec9b6
Update build-ffmpeg
matyo91 Aug 3, 2022
725ea3b
Merge pull request #153 from matyo91/patch-1
markus-perl Aug 4, 2022
15ef520
Update build-ffmpeg
markus-perl Aug 4, 2022
d98a8d6
Bump ffmpeg version 5.1
markus-perl Aug 17, 2022
4cdaf14
Merge pull request #159 from markus-perl/ffmpeg-5.1
markus-perl Aug 18, 2022
c71379c
ffmpeg 5.1
markus-perl Aug 18, 2022
87479d9
Mac M1 build fix
markus-perl Sep 12, 2022
88d4983
Bump Version to 1.40
markus-perl Sep 12, 2022
a90a233
changed version and link of Zlib to 1.2.13
scgreenhalgh Oct 14, 2022
fe2613f
Merge pull request #165 from scgreenhalgh/zlib-version-update
markus-perl Oct 19, 2022
2a1b537
Bump Script Version To 1.41
markus-perl Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions build-ffmpeg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# LICENSE: https://github.com/markus-perl/ffmpeg-build-script/blob/master/LICENSE

PROGNAME=$(basename "$0")
FFMPEG_VERSION=5.0
SCRIPT_VERSION=1.37
FFMPEG_VERSION=5.1
SCRIPT_VERSION=1.41
CWD=$(pwd)
PACKAGES="$CWD/packages"
WORKSPACE="$CWD/workspace"
Expand Down Expand Up @@ -346,12 +346,12 @@ if build "nasm" "2.15.05"; then
build_done "nasm" "2.15.05"
fi

if build "zlib" "1.2.12"; then
download "https://www.zlib.net/zlib-1.2.12.tar.gz"
if build "zlib" "1.2.13"; then
download "https://www.zlib.net/zlib-1.2.13.tar.gz"
execute ./configure --static --prefix="${WORKSPACE}"
execute make -j $MJOBS
execute make install
build_done "zlib" "1.2.12"
build_done "zlib" "1.2.13"
fi

if build "m4" "1.4.19"; then
Expand Down Expand Up @@ -477,7 +477,7 @@ fi
if ! $MACOS_M1; then
if build "svtav1" "0.9.0"; then
# Last known working commit which passed CI Tests from HEAD branch
download "https://github.com/AOMediaCodec/SVT-AV1/archive/refs/tags/v0.9.0.tar.gz" "svtav1-0.9.0.tar.gz"
download "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v0.9.0/SVT-AV1-v0.9.0.tar.gz" "svtav1-0.9.0.tar.gz"
cd "${PACKAGES}"/svtav1-0.9.0//Build/linux || exit
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DENABLE_SHARED=off -DBUILD_SHARED_LIBS=OFF ../.. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
execute make -j $MJOBS
Expand Down Expand Up @@ -768,11 +768,15 @@ if build "libtheora" "1.1.1"; then
sed "s/-fforce-addr//g" configure >configure.patched
chmod +x configure.patched
mv configure.patched configure
##BEGIN CONFIG.GUESS PATCH -- Updating config.guess file. Which allowed me to compile on aarch64 (ARMv8) [linux kernel 4.9 Ubuntu 20.04]
rm config.guess
curl -L --silent -o "config.guess" "https://raw.githubusercontent.com/gcc-mirror/gcc/master/config.guess"
chmod +x config.guess
##END OF CONFIG.GUESS PATCH

if ! $MACOS_M1; then
##BEGIN CONFIG.GUESS PATCH -- Updating config.guess file. Which allowed me to compile on aarch64 (ARMv8) [linux kernel 4.9 Ubuntu 20.04]
rm config.guess
curl -L --silent -o "config.guess" "https://raw.githubusercontent.com/gcc-mirror/gcc/master/config.guess"
chmod +x config.guess
##END OF CONFIG.GUESS PATCH
fi

execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --with-vorbis-libraries="${WORKSPACE}"/lib --with-vorbis-includes="${WORKSPACE}"/include/ --enable-static --disable-shared --disable-oggtest --disable-vorbistest --disable-examples --disable-asm --disable-spec
execute make -j $MJOBS
execute make install
Expand Down