Build rav1e

.github/workflows/wheels-dependencies.sh

@@ -97,51 +97,64 @@ function build_harfbuzz {
     touch harfbuzz-stamp
 }
 
-function install_rav1e {
-    if [ -n "$IS_MACOS" ]; then
-        suffix="macos"
-        if [[ "$PLAT" == "arm64" ]]; then
-            suffix+="-aarch64"
+function build_rav1e {
+    if [ -e rav1e-stamp ]; then return; fi
+    if [[ "$PLAT" == "aarch64" ]]; then
+        curl -sLo - \
+            https://github.com/xiph/rav1e/releases/download/v$RAV1E_VERSION/librav1e-$RAV1E_VERSION-linux-aarch64.tar.gz \
+            | tar -C $BUILD_PREFIX --exclude LICENSE --exclude '*.so' --exclude '*.dylib' -zxf -
+
+        if [ -z "$IS_MACOS" ]; then
+            sed -i 's/-lgcc_s/-lgcc_eh/g' "${BUILD_PREFIX}/lib/pkgconfig/rav1e.pc"
         fi
+
+        # 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
     else
-        suffix="linux"
-        if [[ "$PLAT" == "aarch64" ]]; then
-            suffix+="-aarch64"
-        else
-            suffix+="-generic"
-        fi
-    fi
+        curl https://sh.rustup.rs -sSf | sh -s -- -y
+        . "$HOME/.cargo/env"
 
-    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 -
+        if [ -n "$IS_ALPINE" ]; then
+            apk add openssl-dev openssl-libs-static
+        elif [ -z "$IS_MACOS" ]; then
+            yum install -y openssl-devel
+        fi
 
-    if [ -z "$IS_MACOS" ]; then
-        sed -i 's/-lgcc_s/-lgcc_eh/g' "${BUILD_PREFIX}/lib/pkgconfig/rav1e.pc"
+        local out_dir=$(fetch_unpack https://github.com/xiph/rav1e/archive/refs/tags/v$RAV1E_VERSION.tar.gz)
+        cargo install cargo-c
+        if [ -n "$IS_MACOS" ]; then
+            (cd $out_dir && sudo cargo cinstall --release)
+        else
+            (cd $out_dir && cargo cinstall --release)
+        fi
     fi
-
-    # 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
+    touch rav1e-stamp
 }
 
 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
+    build_rav1e
+
+    python3 -m pip install meson ninja
 
     local out_dir=$(fetch_unpack https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$LIBAVIF_VERSION.tar.gz libavif-$LIBAVIF_VERSION.tar.gz)
+    if [[ "$PLAT" == "aarch64" ]]; then
+      $rav1e=SYSTEM
+    else
+      $rav1e=LOCAL
+    fi
     (cd $out_dir \
         && cmake \
             -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \
@@ -150,7 +163,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 \
@@ -168,12 +181,7 @@ function build {
     fi
     build_new_zlib
 
-    ORIGINAL_LDFLAGS=$LDFLAGS
-    if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "arm64" ]]; then
-        LDFLAGS="${LDFLAGS} -ld64"
-    fi
     build_libavif
-    LDFLAGS=$ORIGINAL_LDFLAGS
 
     build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
     if [ -n "$IS_MACOS" ]; then

.github/workflows/wheels.yml

@@ -10,32 +10,12 @@ on:
   #        │  │ │ │ │
   - cron: "42 1 * * 0,3"
   push:
-    paths:
-      - ".ci/requirements-cibw.txt"
-      - ".github/workflows/wheel*"
-      - "setup.py"
-      - "wheels/*"
-      - "winbuild/build_prepare.py"
-      - "winbuild/fribidi.cmake"
-    tags:
-      - "*"
   pull_request:
-    paths:
-      - ".ci/requirements-cibw.txt"
-      - ".github/workflows/wheel*"
-      - "setup.py"
-      - "wheels/*"
-      - "winbuild/build_prepare.py"
-      - "winbuild/fribidi.cmake"
   workflow_dispatch:
 
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
   FORCE_COLOR: 1
 

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