Sort AVIF codecs alphabetically

fdintino · Feb 1, 2025 · 47403cf · 47403cf
1 parent 590cc64
commit 47403cf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
@@ -14,8 +14,8 @@ brew install \
     little-cms2 \
     openjpeg \
     webp \
-    dav1d \
     aom \
+    dav1d \
     rav1e \
     svt-av1
 if [[ "$ImageOS" == "macos13" ]]; then

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -125,9 +125,9 @@ function build_libavif {
             -DBUILD_SHARED_LIBS=OFF \
             -DAVIF_LIBSHARPYUV=LOCAL \
             -DAVIF_LIBYUV=LOCAL \
-            -DAVIF_CODEC_RAV1E=LOCAL \
             -DAVIF_CODEC_AOM=LOCAL \
             -DAVIF_CODEC_DAV1D=LOCAL \
+            -DAVIF_CODEC_RAV1E=LOCAL \
             -DAVIF_CODEC_SVT=LOCAL \
             -DENABLE_NASM=ON \
             -DCMAKE_MODULE_PATH=/tmp/cmake/Modules \

diff --git a/depends/install_libavif.sh b/depends/install_libavif.sh
@@ -19,11 +19,22 @@ LIBAVIF_CMAKE_FLAGS=()
 HAS_DECODER=0
 HAS_ENCODER=0
 
+if $PKGCONFIG --exists aom; then
+    LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=SYSTEM)
+    HAS_ENCODER=1
+    HAS_DECODER=1
+fi
+
 if $PKGCONFIG --exists dav1d; then
     LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_DAV1D=SYSTEM)
     HAS_DECODER=1
 fi
 
+if $PKGCONFIG --exists libgav1; then
+    LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_LIBGAV1=SYSTEM)
+    HAS_DECODER=1
+fi
+
 if $PKGCONFIG --exists rav1e; then
     LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_RAV1E=SYSTEM)
     HAS_ENCODER=1
@@ -34,17 +45,6 @@ if $PKGCONFIG --exists SvtAv1Enc; then
     HAS_ENCODER=1
 fi
 
-if $PKGCONFIG --exists libgav1; then
-    LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_LIBGAV1=SYSTEM)
-    HAS_DECODER=1
-fi
-
-if $PKGCONFIG --exists aom; then
-    LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=SYSTEM)
-    HAS_ENCODER=1
-    HAS_DECODER=1
-fi
-
 if [ "$HAS_ENCODER" != 1 ] || [ "$HAS_DECODER" != 1 ]; then
     LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=LOCAL)
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,8 @@ brew install \ @@
         little-cms2 \
         openjpeg \
         webp \
-        dav1d \
         aom \
+        dav1d \
         rav1e \
         svt-av1
     if [[ "$ImageOS" == "macos13" ]]; then
@@ Expand Down @@