Skip to content

Commit e1128a1

Browse files
committed
Mac fix
1 parent 0d857d9 commit e1128a1

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

build-ffmpeg

+12-9
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ if command_exists "python3"; then
490490
fi
491491
fi
492492

493-
if build "svtav1" "1.7.0"; then
493+
if build "svtav1" "2.0.0"; then
494494
# Last known working commit which passed CI Tests from HEAD branch
495495
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"
496496
cd "${PACKAGES}"/svtav1-$CURRENT_PACKAGE_VERSION//Build/linux || exit
@@ -637,7 +637,7 @@ if $NONFREE_AND_GPL; then
637637
CONFIGURE_OPTIONS+=("--enable-libvidstab")
638638
fi
639639

640-
if build "av1" "7b5f665"; then
640+
if build "av1" "6cab58c3925e0f4138e15a4ed510161ea83b6db1"; then
641641
# libaom bcfe6fb == v3.5.0
642642
download "https://aomedia.googlesource.com/aom/+archive/$CURRENT_PACKAGE_VERSION.tar.gz" "av1.tar.gz" "av1"
643643
make_dir "$PACKAGES"/aom_build
@@ -765,15 +765,18 @@ if build "libogg" "1.3.5"; then
765765
build_done "libogg" $CURRENT_PACKAGE_VERSION
766766
fi
767767

768-
if build "libvorbis" "1.3.7"; then
769-
download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-$CURRENT_PACKAGE_VERSION.tar.gz"
770-
execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --enable-static --disable-shared --disable-oggtest
771-
execute make -j $MJOBS
772-
execute make install
768+
if [[ "$OSTYPE" != "darwin"* ]]; then
769+
if build "libvorbis" "1.3.7"; then
770+
download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-$CURRENT_PACKAGE_VERSION.tar.gz"
771+
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
773772

774-
build_done "libvorbis" $CURRENT_PACKAGE_VERSION
773+
execute make -j $MJOBS
774+
execute make install
775+
776+
build_done "libvorbis" $CURRENT_PACKAGE_VERSION
777+
fi
778+
CONFIGURE_OPTIONS+=("--enable-libvorbis")
775779
fi
776-
CONFIGURE_OPTIONS+=("--enable-libvorbis")
777780

778781
if build "libtheora" "1.1.1"; then
779782
download "https://ftp.osuosl.org/pub/xiph/releases/theora/libtheora-$CURRENT_PACKAGE_VERSION.tar.gz"

0 commit comments

Comments
 (0)