Skip to content

Commit

Permalink
Mac fix
Browse files Browse the repository at this point in the history
  • Loading branch information
markus-perl committed Apr 30, 2024
1 parent 0d857d9 commit e1128a1
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions build-ffmpeg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit e1128a1

Please sign in to comment.