From 33ec9b686a0dcf9995209c43f637b8ae4c466a4a Mon Sep 17 00:00:00 2001 From: Mathieu Ledru Date: Wed, 3 Aug 2022 15:23:32 +0200 Subject: [PATCH 1/8] Update build-ffmpeg SVT-AV1 repository moved from Github to Gitlab --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index 326145f5..5ca02428 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -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 From 15ef520106f0abe8c1c4814fd44d401fb3f3f87b Mon Sep 17 00:00:00 2001 From: markus-perl <1220081+markus-perl@users.noreply.github.com> Date: Thu, 4 Aug 2022 10:54:18 +0200 Subject: [PATCH 2/8] Update build-ffmpeg --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index 5ca02428..fddfaded 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -5,7 +5,7 @@ PROGNAME=$(basename "$0") FFMPEG_VERSION=5.0 -SCRIPT_VERSION=1.37 +SCRIPT_VERSION=1.38 CWD=$(pwd) PACKAGES="$CWD/packages" WORKSPACE="$CWD/workspace" From d98a8d67b24e158bddfb31420f332f84707675a8 Mon Sep 17 00:00:00 2001 From: markus-perl <1220081+markus-perl@users.noreply.github.com> Date: Wed, 17 Aug 2022 23:10:14 +0200 Subject: [PATCH 3/8] Bump ffmpeg version 5.1 --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index fddfaded..3a50fe57 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -4,7 +4,7 @@ # LICENSE: https://github.com/markus-perl/ffmpeg-build-script/blob/master/LICENSE PROGNAME=$(basename "$0") -FFMPEG_VERSION=5.0 +FFMPEG_VERSION=5.1 SCRIPT_VERSION=1.38 CWD=$(pwd) PACKAGES="$CWD/packages" From c71379c9d69a6195ec94e265b08aa21f23ebd4db Mon Sep 17 00:00:00 2001 From: markus-perl <1220081+markus-perl@users.noreply.github.com> Date: Thu, 18 Aug 2022 08:36:33 +0200 Subject: [PATCH 4/8] ffmpeg 5.1 --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index 3a50fe57..1849083b 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -5,7 +5,7 @@ PROGNAME=$(basename "$0") FFMPEG_VERSION=5.1 -SCRIPT_VERSION=1.38 +SCRIPT_VERSION=1.39 CWD=$(pwd) PACKAGES="$CWD/packages" WORKSPACE="$CWD/workspace" From 87479d967bd26ca33f10ee198e8d752a522878ff Mon Sep 17 00:00:00 2001 From: markus-perl <1220081+markus-perl@users.noreply.github.com> Date: Mon, 12 Sep 2022 08:26:24 +0200 Subject: [PATCH 5/8] Mac M1 build fix --- build-ffmpeg | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/build-ffmpeg b/build-ffmpeg index 1849083b..8b9dea04 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -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 From 88d49833e1c86d44fdec7f2731ea48988c3d2995 Mon Sep 17 00:00:00 2001 From: markus-perl <1220081+markus-perl@users.noreply.github.com> Date: Mon, 12 Sep 2022 10:50:25 +0200 Subject: [PATCH 6/8] Bump Version to 1.40 --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index 8b9dea04..a012d008 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -5,7 +5,7 @@ PROGNAME=$(basename "$0") FFMPEG_VERSION=5.1 -SCRIPT_VERSION=1.39 +SCRIPT_VERSION=1.40 CWD=$(pwd) PACKAGES="$CWD/packages" WORKSPACE="$CWD/workspace" From a90a23322915a3ffc8bbe0916e31750c09529d3d Mon Sep 17 00:00:00 2001 From: scgreenhalgh Date: Fri, 14 Oct 2022 16:49:25 +0800 Subject: [PATCH 7/8] changed version and link of Zlib to 1.2.13 --- build-ffmpeg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-ffmpeg b/build-ffmpeg index a012d008..9e630963 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -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 From 2a1b537aceebf6597804d4127c23b1df836ef510 Mon Sep 17 00:00:00 2001 From: markus-perl <1220081+markus-perl@users.noreply.github.com> Date: Wed, 19 Oct 2022 16:53:31 +0200 Subject: [PATCH 8/8] Bump Script Version To 1.41 --- build-ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-ffmpeg b/build-ffmpeg index 9e630963..a93c7e55 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -5,7 +5,7 @@ PROGNAME=$(basename "$0") FFMPEG_VERSION=5.1 -SCRIPT_VERSION=1.40 +SCRIPT_VERSION=1.41 CWD=$(pwd) PACKAGES="$CWD/packages" WORKSPACE="$CWD/workspace"