diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 8ca30cb8d5f..c37423581d1 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -111,23 +111,16 @@ function install_rav1e { 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 -zxf - - - if [ -z "$IS_MACOS" ]; then - sed -i 's/-lgcc_s/-lgcc_eh/g' "${BUILD_PREFIX}/lib/pkgconfig/rav1e.pc" - fi + local out_dir=$(fetch_unpack https://github.com/xiph/rav1e/releases/download/v$RAV1E_VERSION/librav1e-$RAV1E_VERSION-$suffix.tar.gz) # Force libavif to treat system rav1e as if it were local mkdir -p /tmp/cmake/Modules cat < /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" + IMPORTED_LOCATION "$out_dir/lib/librav1e.a" AVIF_LOCAL ON - INTERFACE_INCLUDE_DIRECTORIES "$BUILD_PREFIX/include/rav1e" + INTERFACE_INCLUDE_DIRECTORIES "$out_dir/include/rav1e" ) EOF }