Skip to content

Commit 47403cf

Browse files
committed
Sort AVIF codecs alphabetically
1 parent 590cc64 commit 47403cf

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.github/workflows/macos-install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ brew install \
1414
little-cms2 \
1515
openjpeg \
1616
webp \
17-
dav1d \
1817
aom \
18+
dav1d \
1919
rav1e \
2020
svt-av1
2121
if [[ "$ImageOS" == "macos13" ]]; then

.github/workflows/wheels-dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ function build_libavif {
125125
-DBUILD_SHARED_LIBS=OFF \
126126
-DAVIF_LIBSHARPYUV=LOCAL \
127127
-DAVIF_LIBYUV=LOCAL \
128-
-DAVIF_CODEC_RAV1E=LOCAL \
129128
-DAVIF_CODEC_AOM=LOCAL \
130129
-DAVIF_CODEC_DAV1D=LOCAL \
130+
-DAVIF_CODEC_RAV1E=LOCAL \
131131
-DAVIF_CODEC_SVT=LOCAL \
132132
-DENABLE_NASM=ON \
133133
-DCMAKE_MODULE_PATH=/tmp/cmake/Modules \

depends/install_libavif.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,22 @@ LIBAVIF_CMAKE_FLAGS=()
1919
HAS_DECODER=0
2020
HAS_ENCODER=0
2121

22+
if $PKGCONFIG --exists aom; then
23+
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=SYSTEM)
24+
HAS_ENCODER=1
25+
HAS_DECODER=1
26+
fi
27+
2228
if $PKGCONFIG --exists dav1d; then
2329
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_DAV1D=SYSTEM)
2430
HAS_DECODER=1
2531
fi
2632

33+
if $PKGCONFIG --exists libgav1; then
34+
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_LIBGAV1=SYSTEM)
35+
HAS_DECODER=1
36+
fi
37+
2738
if $PKGCONFIG --exists rav1e; then
2839
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_RAV1E=SYSTEM)
2940
HAS_ENCODER=1
@@ -34,17 +45,6 @@ if $PKGCONFIG --exists SvtAv1Enc; then
3445
HAS_ENCODER=1
3546
fi
3647

37-
if $PKGCONFIG --exists libgav1; then
38-
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_LIBGAV1=SYSTEM)
39-
HAS_DECODER=1
40-
fi
41-
42-
if $PKGCONFIG --exists aom; then
43-
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=SYSTEM)
44-
HAS_ENCODER=1
45-
HAS_DECODER=1
46-
fi
47-
4848
if [ "$HAS_ENCODER" != 1 ] || [ "$HAS_DECODER" != 1 ]; then
4949
LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=LOCAL)
5050
fi

0 commit comments

Comments
 (0)