diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7b0b5ff..66d2a05 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -9,7 +9,7 @@ env: MACOSX_DEPLOYMENT_TARGET: "10.10" WHEEL_SDIR: wheelhouse CONFIG_PATH: pillow-avif-plugin/wheelbuild/config.sh - LIBAVIF_VERSION: 9575bb2a32346694b9b346652d6ea2c398e80721 + LIBAVIF_VERSION: ee29bec775ab8e6d555f602775301c14302b96e7 jobs: build: diff --git a/depends/install_libavif.sh b/depends/install_libavif.sh index 831c1d5..41fddac 100755 --- a/depends/install_libavif.sh +++ b/depends/install_libavif.sh @@ -20,10 +20,17 @@ PKGCONFIG=${PKGCONFIG:-pkg-config} export CFLAGS="-fPIC -O3 $CFLAGS" export CXXFLAGS="-fPIC -O3 $CXXFLAGS" +ARCHIVE="${LIBAVIF_VERSION}.tar.gz" + +if [[ "$LIBAVIF_VERSION" == *"."* ]]; then + ARCHIVE="v${ARCHIVE}" +fi +echo "ARCHIVE=$ARCHIVE" + echo "::group::Fetching libavif" mkdir -p libavif-$LIBAVIF_VERSION curl -sLo - \ - https://github.com/AOMediaCodec/libavif/archive/v$LIBAVIF_VERSION.tar.gz \ + https://github.com/AOMediaCodec/libavif/archive/$ARCHIVE \ | tar --strip-components=1 -C libavif-$LIBAVIF_VERSION -zxf - pushd libavif-$LIBAVIF_VERSION echo "::endgroup::" diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh index 37d1a9c..e327605 100644 --- a/wheelbuild/config.sh +++ b/wheelbuild/config.sh @@ -4,11 +4,11 @@ set -eo pipefail CONFIG_DIR=$(abspath $(dirname "${BASH_SOURCE[0]}")) ARCHIVE_SDIR=pillow-avif-plugin-depends -LIBAVIF_VERSION=9575bb2a32346694b9b346652d6ea2c398e80721 +LIBAVIF_VERSION=ee29bec775ab8e6d555f602775301c14302b96e7 AOM_VERSION=3.7.0 DAV1D_VERSION=1.2.1 SVT_AV1_VERSION=1.7.0 -RAV1E_VERSION=p20230911 +RAV1E_VERSION=p20231003 LIBWEBP_SHA=e2c85878f6a33f29948b43d3492d9cdaf801aa54 LIBYUV_SHA=464c51a0 CCACHE_VERSION=4.7.1 @@ -351,7 +351,7 @@ function build_rav1e { fi curl -sLo - \ - https://github.com/fdintino/rav1e/releases/download/$RAV1E_VERSION/$librav1e_tgz \ + https://github.com/xiph/rav1e/releases/download/$RAV1E_VERSION/$librav1e_tgz \ | tar -C $BUILD_PREFIX -zxf - if [ ! -n "$IS_MACOS" ]; then @@ -473,7 +473,7 @@ function build_libavif { group_start "Download libavif source" fetch_unpack \ - "https://github.com/fdintino/libavif/archive/$LIBAVIF_VERSION.tar.gz" \ + "https://github.com/AOMediaCodec/libavif/archive/$LIBAVIF_VERSION.tar.gz" \ "libavif-$LIBAVIF_VERSION.tar.gz" group_end diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 3551cda..957a8c5 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -181,10 +181,10 @@ def cmd_msbuild( "libavif": { "url": ( "https://github.com/AOMediaCodec/libavif/archive/" - "04bde5f331064112e230a4de2b0bcb7ebf82bb0c.zip" + "ee29bec775ab8e6d555f602775301c14302b96e7.zip" ), - "filename": "libavif-04bde5f331064112e230a4de2b0bcb7ebf82bb0c.zip", - "dir": "libavif-04bde5f331064112e230a4de2b0bcb7ebf82bb0c", + "filename": "libavif-ee29bec775ab8e6d555f602775301c14302b96e7.zip", + "dir": "libavif-ee29bec775ab8e6d555f602775301c14302b96e7", "license": "LICENSE", "build": [ cmd_mkdir(r"ext\rav1e\build.libavif\usr"),