Allow libavif to install rav1e, except on manylinux2014

radarhere · Dec 6, 2024 · f3c272e · f3c272e
1 parent c40bcbf
commit f3c272e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 34 deletions.
diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -97,48 +97,49 @@ function build_harfbuzz {
     touch harfbuzz-stamp
 }
 
-function install_rav1e {
-    if [ -n "$IS_MACOS" ]; then
-        suffix="macos"
-        if [[ "$PLAT" == "arm64" ]]; then
-            suffix+="-aarch64"
-        fi
-    else
-        suffix="linux"
+function build_libavif {
+    if [ -e libavif-stamp ]; then return; fi
+
+    if [[ -z "$IS_MACOS" ]] && ([[ "$MB_ML_VER" == 2014 ]] || [[ "$PLAT" == "aarch64" ]]); then
+        # Once Amazon 2 is EOL on 30 June 2025, manylinux2014 will no longer be needed
+        # Once GitHub Actions supports aarch64 without emulation, this will no longer needed as building will be faster
         if [[ "$PLAT" == "aarch64" ]]; then
-            suffix+="-aarch64"
+            suffix="aarch64"
         else
-            suffix+="-generic"
+            suffix="generic"
         fi
-    fi
 
-    curl -sLo - \
-        https://github.com/xiph/rav1e/releases/download/v$RAV1E_VERSION/librav1e-$RAV1E_VERSION-$suffix.tar.gz \
-        | tar -C $BUILD_PREFIX --exclude LICENSE --exclude '*.so' --exclude '*.dylib' -zxf -
+        curl -sLo - \
+            https://github.com/xiph/rav1e/releases/download/v$RAV1E_VERSION/librav1e-$RAV1E_VERSION-linux-$suffix.tar.gz \
+            | tar -C $BUILD_PREFIX -zxf -
+
+        # Force libavif to treat system rav1e as if it were local
+        mkdir -p /tmp/cmake/Modules
+        cat <<EOF > /tmp/cmake/Modules/Findrav1e.cmake
+        add_library(rav1e::rav1e STATIC IMPORTED GLOBAL)
+        set_target_properties(rav1e::rav1e PROPERTIES
+            IMPORTED_LOCATION "$BUILD_PREFIX/lib/librav1e.a"
+            AVIF_LOCAL ON
+            INTERFACE_INCLUDE_DIRECTORIES "$BUILD_PREFIX/include/rav1e"
+        )
+EOF
 
-    if [ -z "$IS_MACOS" ]; then
-        sed -i 's/-lgcc_s/-lgcc_eh/g' "${BUILD_PREFIX}/lib/pkgconfig/rav1e.pc"
-    fi
+        rav1e=SYSTEM
+    else
+        curl https://sh.rustup.rs -sSf | sh -s -- -y
+        . "$HOME/.cargo/env"
 
-    # Force libavif to treat system rav1e as if it were local
-    mkdir -p /tmp/cmake/Modules
-    cat <<EOF > /tmp/cmake/Modules/Findrav1e.cmake
-    add_library(rav1e::rav1e STATIC IMPORTED GLOBAL)
-    set_target_properties(rav1e::rav1e PROPERTIES
-        IMPORTED_LOCATION "$BUILD_PREFIX/lib/librav1e.a"
-        AVIF_LOCAL ON
-        INTERFACE_INCLUDE_DIRECTORIES "$BUILD_PREFIX/include/rav1e"
-    )
-EOF
-}
+        if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then
+            yum install -y perl
+        fi
+
+        rav1e=LOCAL
+    fi
 
-function build_libavif {
-    if [ -e libavif-stamp ]; then return; fi
-    install_rav1e
     python3 -m pip install meson ninja
 
     if [[ "$PLAT" == "x86_64" ]]; then
-        build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/
+        build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03
     fi
 
     local out_dir=$(fetch_unpack https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$LIBAVIF_VERSION.tar.gz libavif-$LIBAVIF_VERSION.tar.gz)
@@ -150,7 +151,7 @@ function build_libavif {
             -DBUILD_SHARED_LIBS=OFF \
             -DAVIF_LIBSHARPYUV=LOCAL \
             -DAVIF_LIBYUV=LOCAL \
-            -DAVIF_CODEC_RAV1E=SYSTEM \
+            -DAVIF_CODEC_RAV1E=$rav1e \
             -DAVIF_CODEC_AOM=LOCAL \
             -DAVIF_CODEC_DAV1D=LOCAL \
             -DAVIF_CODEC_SVT=LOCAL \

diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst
@@ -226,7 +226,7 @@ Many of Pillow's features require external libraries:
 
         sudo pkg install jpeg-turbo tiff webp lcms2 freetype2 openjpeg harfbuzz fribidi libxcb libavif
 
-    See ``depends/install_raqm_cmake.sh`` to install libraqm.
+    Then see ``depends/install_raqm_cmake.sh`` to install libraqm.
 
 .. tab:: Android