Skip to content

Commit 2a8b4a5

Browse files
Updating ffmpeg build script to 1.40.rc.1
1 parent 8e24098 commit 2a8b4a5

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

build-ffmpeg

+17-20
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
PROGNAME=$(basename "$0")
77
FFMPEG_VERSION=4.4
8-
SCRIPT_VERSION=1.33rc3
8+
SCRIPT_VERSION=1.40.rc.1
99
CWD=$(pwd)
1010
PACKAGES="$CWD/packages"
1111
WORKSPACE="$CWD/workspace"
@@ -515,11 +515,11 @@ if ! $MACOS_M1; then
515515
fi
516516

517517
if command_exists "cargo"; then
518-
if build "rav1e" "0.5.0-beta"; then
518+
if build "rav1e" "0.6.6"; then
519519
execute cargo install cargo-c
520-
download "https://github.com/xiph/rav1e/archive/refs/tags/v0.5.0-beta.tar.gz"
520+
download "https://github.com/xiph/rav1e/archive/refs/tags/v0.6.6.tar.gz"
521521
execute cargo cinstall --prefix="${WORKSPACE}" --library-type=staticlib --crt-static --release
522-
build_done "rav1e" "0.5.0-beta"
522+
build_done "rav1e" "0.6.6"
523523
fi
524524
CONFIGURE_OPTIONS+=("--enable-librav1e")
525525
fi
@@ -866,7 +866,7 @@ if build "libvorbis" "1.3.7"; then
866866
download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.gz"
867867
echo $PWD
868868

869-
patch configure.ac ${CWD%/descript}vorbis.config.patch
869+
patch configure.ac ${CWD%/descript}/vorbis.config.patch
870870
./autogen.sh
871871
if $SHARED_LIBRARIES; then
872872
execute ./configure --prefix="${WORKSPACE}" --with-ogg-libraries="${WORKSPACE}"/lib --with-ogg-includes="${WORKSPACE}"/include/ --disable-static --enable-shared --disable-oggtest
@@ -953,23 +953,20 @@ if build "libpng" "1.6.37"; then
953953
build_done "libpng" "1.6.37"
954954
fi
955955

956-
## does not compile on monterey -> _PrintGifError
957-
if [[ "$OSTYPE" != "darwin"* ]]; then
958-
if build "libwebp" "1.2.1"; then
959-
# libwebp can fail to compile on Ubuntu if these flags were left set to CFLAGS
960-
CPPFLAGS=
961-
download "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz" "libwebp-1.2.1.tar.gz"
962-
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-dependency-tracking --disable-gl --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib
963-
make_dir build
964-
cd build || exit
965-
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
966-
execute make -j $MJOBS
967-
execute make install
956+
if build "libwebp" "1.2.1"; then
957+
# libwebp can fail to compile on Ubuntu if these flags were left set to CFLAGS
958+
CPPFLAGS=
959+
download "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.2.1.tar.gz" "libwebp-1.2.1.tar.gz"
960+
execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-dependency-tracking --disable-gl --with-zlib-include="${WORKSPACE}"/include/ --with-zlib-lib="${WORKSPACE}"/lib
961+
make_dir build
962+
cd build || exit
963+
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_INCLUDEDIR=include -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ../
964+
execute make -j $MJOBS
965+
execute make install
968966

969-
build_done "libwebp" "1.2.1"
970-
fi
971-
CONFIGURE_OPTIONS+=("--enable-libwebp")
967+
build_done "libwebp" "1.2.1"
972968
fi
969+
CONFIGURE_OPTIONS+=("--enable-libwebp")
973970
##
974971
## other library
975972
##

0 commit comments

Comments
 (0)