From e9e24090bb887e7e7b488caf0ab645b2f4434f9b Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 15 Oct 2024 22:15:39 +0100 Subject: [PATCH 1/9] Pass through rayon feature to ravif --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c540d148f9..d799052da0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ image-webp = { version = "0.2.0", optional = true } mp4parse = { version = "0.17.0", optional = true } png = { version = "0.17.6", optional = true } qoi = { version = "0.4", optional = true } -ravif = { version = "0.11.3", default-features = false, optional = true } +ravif = { version = "0.11.10", default-features = false, optional = true } rayon = { version = "1.7.0", optional = true } rgb = { version = "0.8.48", default-features = false, optional = true } tiff = { version = "0.9.0", optional = true } @@ -85,7 +85,7 @@ tiff = ["dep:tiff"] webp = ["dep:image-webp"] # Other features -rayon = ["dep:rayon"] # Enables multi-threading +rayon = ["dep:rayon", "ravif?/threading"] # Enables multi-threading nasm = ["ravif?/asm"] # Enables use of nasm by rav1e (requires nasm to be installed) color_quant = ["dep:color_quant"] # Enables color quantization avif-native = ["dep:mp4parse", "dep:dcv-color-primitives", "dep:dav1d"] # Enable native dependency libdav1d From 452ee50bf71fba3deec4cc0cd6627e2c530dcad7 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 15 Oct 2024 23:28:44 +0100 Subject: [PATCH 2/9] Bump MSRV to 1.70 following ravif --- .github/workflows/rust.yml | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 259bd81100..96da5d9a9c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,14 +38,14 @@ jobs: strategy: fail-fast: false matrix: - rust: ["1.67.1", nightly, beta] + rust: ["1.70.0", nightly, beta] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - if: ${{ matrix.rust == '1.67.1' }} + if: ${{ matrix.rust == '1.70.0' }} - name: Generate Cargo.lock with minimal-version dependencies - if: ${{ matrix.rust == '1.67.1' }} + if: ${{ matrix.rust == '1.70.0' }} run: cargo -Zminimal-versions generate-lockfile - uses: dtolnay/rust-toolchain@v1 @@ -58,7 +58,7 @@ jobs: - name: build run: cargo build -v - name: test - if: ${{ matrix.rust != '1.67.1' }} + if: ${{ matrix.rust != '1.70.0' }} run: cargo test -v && cargo doc -v test_other_archs: diff --git a/Cargo.toml b/Cargo.toml index d799052da0..248fb92d13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" resolver = "2" # note: when changed, also update test runner in `.github/workflows/rust.yml` -rust-version = "1.67.1" +rust-version = "1.70.0" license = "MIT OR Apache-2.0" description = "Imaging library. Provides basic image processing and encoders/decoders for common image formats." From 8828ad41f28cf8969cbc4eb628b12db032248a6b Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 15 Oct 2024 23:32:29 +0100 Subject: [PATCH 3/9] Do not require such a recent ravif --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 248fb92d13..ce33fc3062 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ image-webp = { version = "0.2.0", optional = true } mp4parse = { version = "0.17.0", optional = true } png = { version = "0.17.6", optional = true } qoi = { version = "0.4", optional = true } -ravif = { version = "0.11.10", default-features = false, optional = true } +ravif = { version = "0.11.9", default-features = false, optional = true } rayon = { version = "1.7.0", optional = true } rgb = { version = "0.8.48", default-features = false, optional = true } tiff = { version = "0.9.0", optional = true } From 4d438c58ee2b987aa7d8e19e181c2372c89e4615 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 15 Oct 2024 23:40:18 +0100 Subject: [PATCH 4/9] Bump MSRV to 1.79 because bitstream-io, a transitive dependency of ravif, requires it --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ce33fc3062..57c154d9b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" resolver = "2" # note: when changed, also update test runner in `.github/workflows/rust.yml` -rust-version = "1.70.0" +rust-version = "1.79.0" license = "MIT OR Apache-2.0" description = "Imaging library. Provides basic image processing and encoders/decoders for common image formats." From 0a88f97510c10495b4a92c690caf40e1b7ceb671 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Tue, 15 Oct 2024 23:45:27 +0100 Subject: [PATCH 5/9] Bump MSRV in github actions as well --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 96da5d9a9c..b4e600f78a 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,14 +38,14 @@ jobs: strategy: fail-fast: false matrix: - rust: ["1.70.0", nightly, beta] + rust: ["1.79.0", nightly, beta] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - if: ${{ matrix.rust == '1.70.0' }} + if: ${{ matrix.rust == '1.79.0' }} - name: Generate Cargo.lock with minimal-version dependencies - if: ${{ matrix.rust == '1.70.0' }} + if: ${{ matrix.rust == '1.79.0' }} run: cargo -Zminimal-versions generate-lockfile - uses: dtolnay/rust-toolchain@v1 @@ -58,7 +58,7 @@ jobs: - name: build run: cargo build -v - name: test - if: ${{ matrix.rust != '1.70.0' }} + if: ${{ matrix.rust != '1.79.0' }} run: cargo test -v && cargo doc -v test_other_archs: From d2b0a15419aafba334ac2b640dd4eb6823236068 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 17 Oct 2024 16:10:05 +0100 Subject: [PATCH 6/9] Revert "Bump MSRV in github actions as well" This reverts commit 0a88f97510c10495b4a92c690caf40e1b7ceb671. --- .github/workflows/rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b4e600f78a..96da5d9a9c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -38,14 +38,14 @@ jobs: strategy: fail-fast: false matrix: - rust: ["1.79.0", nightly, beta] + rust: ["1.70.0", nightly, beta] steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - if: ${{ matrix.rust == '1.79.0' }} + if: ${{ matrix.rust == '1.70.0' }} - name: Generate Cargo.lock with minimal-version dependencies - if: ${{ matrix.rust == '1.79.0' }} + if: ${{ matrix.rust == '1.70.0' }} run: cargo -Zminimal-versions generate-lockfile - uses: dtolnay/rust-toolchain@v1 @@ -58,7 +58,7 @@ jobs: - name: build run: cargo build -v - name: test - if: ${{ matrix.rust != '1.79.0' }} + if: ${{ matrix.rust != '1.70.0' }} run: cargo test -v && cargo doc -v test_other_archs: From 5f91859b1bc1946f03a59cd19184254f9302a010 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 17 Oct 2024 16:10:11 +0100 Subject: [PATCH 7/9] Revert "Bump MSRV to 1.79 because bitstream-io, a transitive dependency of ravif, requires it" This reverts commit 4d438c58ee2b987aa7d8e19e181c2372c89e4615. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 57c154d9b5..ce33fc3062 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" resolver = "2" # note: when changed, also update test runner in `.github/workflows/rust.yml` -rust-version = "1.79.0" +rust-version = "1.70.0" license = "MIT OR Apache-2.0" description = "Imaging library. Provides basic image processing and encoders/decoders for common image formats." From c83259e6133b0f8be1e74b9002c6a2f4598d450c Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 17 Oct 2024 16:10:12 +0100 Subject: [PATCH 8/9] Revert "Do not require such a recent ravif" This reverts commit 8828ad41f28cf8969cbc4eb628b12db032248a6b. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ce33fc3062..248fb92d13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ image-webp = { version = "0.2.0", optional = true } mp4parse = { version = "0.17.0", optional = true } png = { version = "0.17.6", optional = true } qoi = { version = "0.4", optional = true } -ravif = { version = "0.11.9", default-features = false, optional = true } +ravif = { version = "0.11.10", default-features = false, optional = true } rayon = { version = "1.7.0", optional = true } rgb = { version = "0.8.48", default-features = false, optional = true } tiff = { version = "0.9.0", optional = true } From d640382600b90a66660e40a9fbc822e2c364a795 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Thu, 17 Oct 2024 16:10:46 +0100 Subject: [PATCH 9/9] Require ravif 0.11.11 that has MSRV 1.70 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 248fb92d13..b7895fac83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ image-webp = { version = "0.2.0", optional = true } mp4parse = { version = "0.17.0", optional = true } png = { version = "0.17.6", optional = true } qoi = { version = "0.4", optional = true } -ravif = { version = "0.11.10", default-features = false, optional = true } +ravif = { version = "0.11.11", default-features = false, optional = true } rayon = { version = "1.7.0", optional = true } rgb = { version = "0.8.48", default-features = false, optional = true } tiff = { version = "0.9.0", optional = true }