Skip to content

Commit

Permalink
Update libavif sha
Browse files Browse the repository at this point in the history
  • Loading branch information
fdintino committed Oct 6, 2023
1 parent c143faa commit 26a620b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 8 additions & 1 deletion depends/install_libavif.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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::"
Expand Down
8 changes: 4 additions & 4 deletions wheelbuild/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions winbuild/build_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down

0 comments on commit 26a620b

Please sign in to comment.