diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index 25b6983b1a0..d7b54a588d3 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -13,7 +13,8 @@ brew install \ webp \ dav1d \ aom \ - rav1e + rav1e \ + ninja if [[ "$ImageOS" == "macos13" ]]; then brew install --ignore-dependencies libraqm else diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 218b6770dcf..d0a0590991b 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -82,9 +82,8 @@ function install_rav1e { fi # Force libavif to treat system rav1e as if it were local - local cmake=$(get_modern_cmake) - local cmake_root=`$cmake --system-information 2>&1 | grep CMAKE_ROOT | grep -v CMAKE_ROOT:INTERNAL | sed -e s/\"//g -e 's/CMAKE_ROOT //g'` - cat < $cmake_root/Modules/Findrav1e.cmake + 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" @@ -118,7 +117,7 @@ function build_libavif { -DAVIF_CODEC_DAV1D=LOCAL \ -DAVIF_CODEC_SVT=LOCAL \ -DENABLE_NASM=ON \ - -DCMAKE_MACOSX_RPATH=OFF \ + -DCMAKE_MODULE_PATH=/tmp/cmake/Modules \ . \ && make install) @@ -209,11 +208,11 @@ if [[ -n "$IS_MACOS" ]]; then # remove webp and zstd to avoid inclusion on x86_64 # remove aom and libavif to fix building on arm64 # curl from brew requires zstd, use system curl - brew remove --ignore-dependencies libpng libtiff libxcb libxau libxdmcp curl cairo lcms2 zstd aom libavif + brew remove --ignore-dependencies libpng libtiff libxcb libxau libxdmcp curl cairo lcms2 zstd if [[ "$CIBW_ARCHS" == "arm64" ]]; then brew remove --ignore-dependencies jpeg-turbo else - brew remove --ignore-dependencies webp + brew remove --ignore-dependencies webp aom libavif fi brew install pkg-config diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 4b91984f58a..cf866861d2c 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -6,7 +6,7 @@ def test_wheel_modules() -> None: - expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp"} + expected_modules = {"pil", "tkinter", "freetype2", "littlecms2", "webp", "avif"} # tkinter is not available in cibuildwheel installed CPython on Windows try: diff --git a/depends/install_libavif.sh b/depends/install_libavif.sh index 0f63afda32f..09646c4ad78 100755 --- a/depends/install_libavif.sh +++ b/depends/install_libavif.sh @@ -57,6 +57,6 @@ cmake -G Ninja -S . -B build \ -DCMAKE_MACOSX_RPATH=OFF \ "${LIBAVIF_CMAKE_FLAGS[@]}" -ninja -C build install +sudo ninja -C build install popd