|
5 | 5 |
|
6 | 6 | PROGNAME=$(basename "$0")
|
7 | 7 | FFMPEG_VERSION=4.4
|
8 |
| -SCRIPT_VERSION=1.33rc3 |
| 8 | +SCRIPT_VERSION=1.40.rc.1 |
9 | 9 | CWD=$(pwd)
|
10 | 10 | PACKAGES="$CWD/packages"
|
11 | 11 | WORKSPACE="$CWD/workspace"
|
@@ -515,11 +515,11 @@ if ! $MACOS_M1; then
|
515 | 515 | fi
|
516 | 516 |
|
517 | 517 | if command_exists "cargo"; then
|
518 |
| - if build "rav1e" "0.5.0-beta"; then |
| 518 | + if build "rav1e" "0.6.6"; then |
519 | 519 | 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" |
521 | 521 | 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" |
523 | 523 | fi
|
524 | 524 | CONFIGURE_OPTIONS+=("--enable-librav1e")
|
525 | 525 | fi
|
@@ -866,7 +866,7 @@ if build "libvorbis" "1.3.7"; then
|
866 | 866 | download "https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.7.tar.gz"
|
867 | 867 | echo $PWD
|
868 | 868 |
|
869 |
| - patch configure.ac ${CWD%/descript}vorbis.config.patch |
| 869 | + patch configure.ac ${CWD%/descript}/vorbis.config.patch |
870 | 870 | ./autogen.sh
|
871 | 871 | if $SHARED_LIBRARIES; then
|
872 | 872 | 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
|
953 | 953 | build_done "libpng" "1.6.37"
|
954 | 954 | fi
|
955 | 955 |
|
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 |
968 | 966 |
|
969 |
| - build_done "libwebp" "1.2.1" |
970 |
| - fi |
971 |
| - CONFIGURE_OPTIONS+=("--enable-libwebp") |
| 967 | + build_done "libwebp" "1.2.1" |
972 | 968 | fi
|
| 969 | +CONFIGURE_OPTIONS+=("--enable-libwebp") |
973 | 970 | ##
|
974 | 971 | ## other library
|
975 | 972 | ##
|
|
0 commit comments