From e1128a1b262b98b204f181131e68ad92faef2604 Mon Sep 17 00:00:00 2001 From: Markus Perl <1220081+markus-perl@users.noreply.github.com> Date: Tue, 30 Apr 2024 22:27:38 +0200 Subject: [PATCH] Mac fix --- build-ffmpeg | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/build-ffmpeg b/build-ffmpeg index 6fa6e98..f74c970 100755 --- a/build-ffmpeg +++ b/build-ffmpeg @@ -490,7 +490,7 @@ if command_exists "python3"; then fi fi -if build "svtav1" "1.7.0"; then +if build "svtav1" "2.0.0"; then # Last known working commit which passed CI Tests from HEAD branch download "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$CURRENT_PACKAGE_VERSION/SVT-AV1-v$CURRENT_PACKAGE_VERSION.tar.gz" "svtav1-$CURRENT_PACKAGE_VERSION.tar.gz" cd "${PACKAGES}"/svtav1-$CURRENT_PACKAGE_VERSION//Build/linux || exit @@ -637,7 +637,7 @@ if $NONFREE_AND_GPL; then CONFIGURE_OPTIONS+=("--enable-libvidstab") fi -if build "av1" "7b5f665"; then +if build "av1" "6cab58c3925e0f4138e15a4ed510161ea83b6db1"; then # libaom bcfe6fb == v3.5.0 download "https://aomedia.googlesource.com/aom/+archive/$CURRENT_PACKAGE_VERSION.tar.gz" "av1.tar.gz" "av1" make_dir "$PACKAGES"/aom_build @@ -765,15 +765,18 @@ if build "libogg" "1.3.5"; then build_done "libogg" $CURRENT_PACKAGE_VERSION fi -if build "libvorbis" "1.3.7"; then - download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-$CURRENT_PACKAGE_VERSION.tar.gz" - execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --enable-static --disable-shared --disable-oggtest - execute make -j $MJOBS - execute make install +if [[ "$OSTYPE" != "darwin"* ]]; then + if build "libvorbis" "1.3.7"; then + download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-$CURRENT_PACKAGE_VERSION.tar.gz" + execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --enable-static --disable-shared --disable-oggtest --disable-silent-rules --disable-dependency-tracking - build_done "libvorbis" $CURRENT_PACKAGE_VERSION + execute make -j $MJOBS + execute make install + + build_done "libvorbis" $CURRENT_PACKAGE_VERSION + fi + CONFIGURE_OPTIONS+=("--enable-libvorbis") fi -CONFIGURE_OPTIONS+=("--enable-libvorbis") if build "libtheora" "1.1.1"; then download "https://ftp.osuosl.org/pub/xiph/releases/theora/libtheora-$CURRENT_PACKAGE_VERSION.tar.gz"