From be4cc24c147ac6381e8c447352afe7f07cd83561 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 11 Mar 2026 23:20:32 +1100 Subject: [PATCH 1/2] libavif does not compile successfully with CMake < 3.24 --- amazon-2023-amd64/Dockerfile | 1 - ubuntu-22.04-jammy-amd64-valgrind/Dockerfile | 1 - ubuntu-22.04-jammy-amd64/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/amazon-2023-amd64/Dockerfile b/amazon-2023-amd64/Dockerfile index e29b633d..c360adec 100644 --- a/amazon-2023-amd64/Dockerfile +++ b/amazon-2023-amd64/Dockerfile @@ -57,7 +57,6 @@ RUN wget --no-verbose https://github.com/ninja-build/ninja/releases/download/v1. RUN /usr/bin/python3.11 -m pip install meson RUN cd /depends \ && ./install_imagequant.sh \ - && ./install_libavif.sh \ && ./install_openjpeg.sh \ && ./install_raqm.sh \ && ./install_webp.sh diff --git a/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile b/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile index f41046e7..0007337b 100644 --- a/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile +++ b/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile @@ -49,7 +49,6 @@ RUN virtualenv -p /usr/bin/python3.10-dbg --system-site-packages /vpy3 \ COPY depends /depends RUN cd /depends \ - && ./install_libavif.sh \ && ./install_raqm.sh COPY python.supp /depends diff --git a/ubuntu-22.04-jammy-amd64/Dockerfile b/ubuntu-22.04-jammy-amd64/Dockerfile index a6f5e3fc..655be042 100644 --- a/ubuntu-22.04-jammy-amd64/Dockerfile +++ b/ubuntu-22.04-jammy-amd64/Dockerfile @@ -57,7 +57,6 @@ RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \ COPY depends /depends RUN cd /depends \ - && ./install_libavif.sh \ && ./install_raqm.sh ENV FORCE_COLOR=1 From 740e9c7e2179cf4ab3498d72b4f415bfda396312 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 11 Mar 2026 23:22:05 +1100 Subject: [PATCH 2/2] Revert "Install patch for libavif" This reverts commit 220dd8c10a8f0b4c5f8d5b7619927df279d25990. --- amazon-2023-amd64/Dockerfile | 1 - centos-stream-10-amd64/Dockerfile | 1 - centos-stream-9-amd64/Dockerfile | 1 - 3 files changed, 3 deletions(-) diff --git a/amazon-2023-amd64/Dockerfile b/amazon-2023-amd64/Dockerfile index c360adec..7a0eba76 100644 --- a/amazon-2023-amd64/Dockerfile +++ b/amazon-2023-amd64/Dockerfile @@ -18,7 +18,6 @@ RUN yum install -y \ make \ nasm \ openssl-devel \ - patch \ python3.11-devel \ python3.11-pip \ python3.11-test \ diff --git a/centos-stream-10-amd64/Dockerfile b/centos-stream-10-amd64/Dockerfile index 727f043b..b8bea1d2 100644 --- a/centos-stream-10-amd64/Dockerfile +++ b/centos-stream-10-amd64/Dockerfile @@ -21,7 +21,6 @@ RUN yum install -y \ nasm \ openjpeg2-devel \ openssl-devel \ - patch \ python3-devel \ python3-pip \ python3-tkinter \ diff --git a/centos-stream-9-amd64/Dockerfile b/centos-stream-9-amd64/Dockerfile index 8b120f65..a6e61781 100644 --- a/centos-stream-9-amd64/Dockerfile +++ b/centos-stream-9-amd64/Dockerfile @@ -21,7 +21,6 @@ RUN yum install -y \ ninja-build \ openjpeg2-devel \ openssl-devel \ - patch \ sqlite-devel \ sudo \ tcl-devel \