From 7f513524cb7be38356894c80cc1e0746706edd19 Mon Sep 17 00:00:00 2001
From: Dustin Wiemar <dustin@wiemar.eu>
Date: Sat, 16 Nov 2024 17:07:40 +0100
Subject: [PATCH 1/3]  imagick: increase test coverage

---
 layers/imagick/.gitignore                     |   1 +
 layers/imagick/test.php                       |  44 ++++++++++++++++--
 layers/imagick/testfiles/avif_test.avif       | Bin 0 -> 1338 bytes
 layers/imagick/testfiles/jpg_test.jpg         | Bin 0 -> 5405 bytes
 .../{test.pdf => testfiles/pdf_test.pdf}      | Bin
 layers/imagick/testfiles/png_test.png         | Bin 0 -> 5091 bytes
 6 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 layers/imagick/.gitignore
 create mode 100644 layers/imagick/testfiles/avif_test.avif
 create mode 100644 layers/imagick/testfiles/jpg_test.jpg
 rename layers/imagick/{test.pdf => testfiles/pdf_test.pdf} (100%)
 create mode 100644 layers/imagick/testfiles/png_test.png

diff --git a/layers/imagick/.gitignore b/layers/imagick/.gitignore
new file mode 100644
index 00000000..574e3bdc
--- /dev/null
+++ b/layers/imagick/.gitignore
@@ -0,0 +1 @@
+testoutput
\ No newline at end of file
diff --git a/layers/imagick/test.php b/layers/imagick/test.php
index 42889618..91a0e821 100644
--- a/layers/imagick/test.php
+++ b/layers/imagick/test.php
@@ -5,7 +5,9 @@
     exit(1);
 }
 
-foreach (['PNG', 'JPG', 'GIF', 'WEBP', 'HEIC'] as $format) {
+$expected_formats = ['PNG', 'JPG', 'GIF', 'WEBP', 'HEIC', 'AVIF'];
+
+foreach ( $expected_formats as $format) {
     if (!\Imagick::queryFormats($format)) {
         echo sprintf('FAIL: Imagick does not support "%s".', $format).PHP_EOL;
         exit(1);
@@ -27,16 +29,48 @@
     exit(1);
 }
 
+
 try {
-    $image = new \Imagick(__DIR__.'/test.pdf');
-    $image->writeImage('/tmp/imagick-test.jpg');
-    assert(file_exists('/tmp/imagick-test.jpg'));
+    $tmpdir = '/tmp/imagicktest';
+    mkdir($tmpdir);
+
+    foreach ($expected_formats as $format) {
+        //for all files in the testfiles directory
+        foreach (glob(__DIR__.'/testfiles/*') as $file) {
+            $image = new \Imagick($file);
+            $output_path = $tmpdir . '/' .pathinfo($file, PATHINFO_FILENAME) . '.' . strtolower($format);
+            $image->writeImage($output_path);
+            validateImageFile($output_path);
+        }
+    }
+
+    // compare the size of the AVIF image with the original JPG, buggy builds may just copy the jpg 
+    assert(filesize( $tmpdir . '/jpg_test.avif') < filesize(__DIR__.'/testfiles/jpg_test.jpg') * 0.9);
+
+    // copy the output files to the testoutput directory, if it exists. Useful for local testing
+    if (file_exists('/var/task/testoutput')){
+        foreach (glob($tmpdir.'/*') as $file) {
+            copy($file, '/var/task/testoutput/'.basename($file));
+        }
+    }
+
 } catch(\ImagickException $e) {
-    echo sprintf('FAIL: Imagick cannot convert PDF "%s".', $e->getMessage()).PHP_EOL;
+    echo sprintf('FAIL: Imagick failed to write image "%s".', $e->getMessage()).PHP_EOL;
     exit(1);
 } catch (\Throwable $e) {
     echo sprintf('FAIL: Imagick failed with "%s" exception: %s', get_class($e), $e->getMessage()).PHP_EOL;
     exit(1);
 }
 
+// some basic image validation
+function validateImageFile($file) {
+    assert(file_exists($file), 'File does not exist: ' . $file);
+    assert(filesize($file) > 128, 'File size ( '. filesize($file) .' byte ) is < byte for ' . $file );
+    // only for supported formats
+    if (in_array(pathinfo($file, PATHINFO_EXTENSION), ['png', 'jpg', 'webp', 'avif']) && version_compare(phpversion(), '8.3', '>=')) {
+        assert(getimagesize($file) !== false, 'getimagesize failed for ' . $file);
+    }
+
+}
+
 exit(0);
diff --git a/layers/imagick/testfiles/avif_test.avif b/layers/imagick/testfiles/avif_test.avif
new file mode 100644
index 0000000000000000000000000000000000000000..f9247c91bac38df1dce578fcb2726fbeb2c08e33
GIT binary patch
literal 1338
zcmZQzV30{GsVvCNOfzHv0uY^8mYJ5DnV1ITe$GuTNd$=lfnr8VP7#F3z)+BxTmoam
zXug8Xl3Xx{5lG5q=Hw@Xcq|SKj6etkjN%}gMH$G{$jr<GSpXCSVksael?lpAEHg0l
z%uP&B1@VhA3yKPWbZ}-taz2n2$t*4aO90scKnyZVpdhgrqy}UX2#Y6{89FyAFfed&
zT1ciJxx^&J-~bdBD9EhH1kw!592^`#N<6b5Hxa}K0-ys~7@3+|fUeWdO-U?4(rGl6
zLs)@RWx^rvH4S&YE}E1~I3L67u6tw!w^7D?(V6lGo*e(b_Kugq&YITXgRZYU5-%H`
zPN~oTXtRV-IG6qA?UI~jPu&u<-t&cO%#2QMwwrx_iTYiC!#0N8o(<2VZNum6wwT6M
z9&_`M_Kw5s7PmF(c@3>jd`i675w%QYrOn4CvyAT=e|~4bIK)-qb@JcknKmaCuCq+J
z_xYsmiDs4N6aOsgAL-sG+p=U?tERKTv5VD_>x%SeJ&anY`_XjunQb}CmidNPPx@$)
z{d>u|o#_hxxq_ab3>_6Ko@_fOw~Vvn#Pn||4)Si9Jmr5_{bE!+{Ds{4R`PjYt+al3
z!2L|TVh0n`n+s>pRlPoQU|Y$@OE)sqGVT;zy0HC9pG(v0fDNx3zBaGBmHl%@RCH-V
zcKl=x4l(i1PII+hE`P?l_qN8N*r!^T`Ic6$+|amhnO#-6ve6am=3^T!8hf|(t0_3d
zvk8Ss)byF3vB(m<Ena`NUc9mG<EzXg&kU01d+sdtEq}P<Ls$6u(;I43mdEz9Utb$I
zJIepo<qPU_bT_fH7{&8Ejt`!<Fx5Dr=~cGaTB{%ZHGix2-;dfT_q5)1yUO*q&yN+P
zMXWbDuwX^<z7q_;Pj?&?p4ZIL(5ut(xo^AGT+Ro^jscokU!+!j__&`#Ds!IzgWeOP
zVx~jSWNv&`e0?fFOstK6ja<-j^A8aXH}lOF>oQ6o(D?K)!u)7^VcbtvJ!Z4T?^rLz
zN?txReXVUwXYBXdZCgI=i&$RP`J8{havRtA>;F4y*miw6?|jr!i)Rvdd!VrQ44cGf
zs)Aa!3Kpj_4m3a6^vvkY`@Gk@vjtwRdHthK-+Ez`mTT@YrFZ8wvUh77JUt`ooow@7
zv8LH8M5BL;U05sesO3PmaX;UB3A@G_jf-FMNY(7rc>U}9^}TyDjYTcudv;BksWDyr
z(2j(rgdLR!wbf!}q}E?xo_W3VLjU$z-xowVSpK{r_4H`wZ*CiYmZ$4EBOY?-XHVOI
zXyT43O-c`5PrS40ZSzFuHv2PmMaHGJ=R#9vTStcMT%F0Yhbz+mYp~La<a4hXwZbl*
zTNy2{5&T%{QuN9Mj_nt|H`PRRPhBo%l505g`W@B(@+EH3)AcRQP4$Hi1Z<e!`nH^P
zXQ65Pk)_f`FHAcE_o+L+NMkJuoTSgmX7ugI`^{~k$(eg2N){KET(f#O@pN*q<~p9r
z>Zy*(Qq7zE_C5{Tx{UqQ`R@k`!p=>9AG^IY(5Cr%qR7-Gf1(bSR6Te)|9(rM<B#>#
z51)N_w$oGPNcaRtb><8X>*l$q-G8LJF7x}gt;Y6G-qB0P93M;WTVi=Z#f>SZkM)WC
z(e<v2mN;Dy6P4?Dke{SndU5CPCWWVgSvSh(8y|hTDwD_jS{CDmlU;{6`(Hgw+PgzF
Ps8{tm``W`3CJO)nFpxH<

literal 0
HcmV?d00001

diff --git a/layers/imagick/testfiles/jpg_test.jpg b/layers/imagick/testfiles/jpg_test.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d05f9d62fb08afaef20bc91221251664e6373369
GIT binary patch
literal 5405
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
BU#tKC

literal 0
HcmV?d00001

diff --git a/layers/imagick/test.pdf b/layers/imagick/testfiles/pdf_test.pdf
similarity index 100%
rename from layers/imagick/test.pdf
rename to layers/imagick/testfiles/pdf_test.pdf
diff --git a/layers/imagick/testfiles/png_test.png b/layers/imagick/testfiles/png_test.png
new file mode 100644
index 0000000000000000000000000000000000000000..c40ae0c745a205e96663aa75320d43cf7b3c9d5a
GIT binary patch
literal 5091
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
FV1ix+uB`w7

literal 0
HcmV?d00001


From cc63136505ad895b2bdf6992d8f642e292bedd44 Mon Sep 17 00:00:00 2001
From: Dustin Wiemar <dustin@wiemar.eu>
Date: Sat, 16 Nov 2024 17:09:25 +0100
Subject: [PATCH 2/3] imagick: build with support for AVIF format

---
 CHANGELOG.md              |  4 ++
 layers/imagick/Dockerfile | 95 +++++++++++++++++++--------------------
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c901b44..dd0fae93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change log
 
+## 1.4.11
+
+- Upgrade Imagick to version 7.1.1-38 and build with support for AVIF format (aom encoder).
+
 ## 1.4.10
 
 - Updated Blackfire to version 1.92.26.
diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile
index 7f4f657d..fc9b8a7c 100644
--- a/layers/imagick/Dockerfile
+++ b/layers/imagick/Dockerfile
@@ -3,68 +3,67 @@ ARG BREF_VERSION
 FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext
 ARG PHP_VERSION
 
+ENV IMAGICK_VERSION="7.1.1-38"
+ENV AOM_VERSION="3.10.0"
+ENV LIBHEIF_VERSION="1.19.3"
+ENV LIBDE265_VERSION="1.0.15"
+ENV LIBWEBP_VERSION="1.4.0"
+ENV GS_VERSION="9.56.1"
+ENV IMAGICK_EXT_COMMIT="28f27044e435a2b203e32675e942eb8de620ee58"
+
 # Prepare environment
 ENV IMAGICK_BUILD_DIR=${BUILD_DIR}/imagick
 RUN mkdir -p ${IMAGICK_BUILD_DIR}
-RUN LD_LIBRARY_PATH= yum -y install libpng-devel libjpeg-devel lcms2-devel ImageMagick-devel
+WORKDIR ${IMAGICK_BUILD_DIR}
+RUN LD_LIBRARY_PATH= yum -y install libpng-devel libjpeg-devel lcms2-devel ImageMagick-devel nasm gcc10.x86_64 gcc10-c++.x86_64
+
+# Use gcc10 as the default compiler, needed for AOM
+ENV CXX="/usr/bin/gcc10-g++" 
+ENV CC="/usr/bin/gcc10-gcc"
 
 # Compile libwebp since AL2 ships with v0.3, and v0.4 or higher is required to builder the other libs
-WORKDIR ${IMAGICK_BUILD_DIR}
-RUN curl -Ls -o libwebp.tar.gz https://github.com/webmproject/libwebp/archive/refs/tags/v1.4.0.tar.gz
-RUN tar xzf libwebp.tar.gz
-WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.4.0
-RUN autoreconf -i && automake && autoconf
-RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR}
-RUN make -j $(nproc) && make install
+RUN curl -Ls -o libwebp.tar.gz https://github.com/webmproject/libwebp/archive/refs/tags/v${LIBWEBP_VERSION}.tar.gz && tar xzf libwebp.tar.gz && rm libwebp.tar.gz \
+    && cd ${IMAGICK_BUILD_DIR}/libwebp-${LIBWEBP_VERSION} \
+    && autoreconf -i && automake && autoconf \
+    && ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} \
+    && make -j $(nproc) && make install && rm -rf ${IMAGICK_BUILD_DIR}/libwebp-${LIBWEBP_VERSION}
+
+# Compile AOM (libavif dependency for AVIF support)
+RUN git clone -b v${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom \
+    && mkdir -p ${IMAGICK_BUILD_DIR}/aom_build && cd ${IMAGICK_BUILD_DIR}/aom_build  \
+    && cmake ../aom -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_SHARED_LIBS=1 -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 \
+    && make -j $(nproc) && make install && rm -rf ${IMAGICK_BUILD_DIR}/aom && rm -rf ${IMAGICK_BUILD_DIR}/aom_build
 
 # Compile libde265 (libheif dependency)
-WORKDIR ${IMAGICK_BUILD_DIR}
-RUN curl -Ls -o libde265.tar.gz https://github.com/strukturag/libde265/releases/download/v1.0.15/libde265-1.0.15.tar.gz && tar xzf libde265.tar.gz
-WORKDIR ${IMAGICK_BUILD_DIR}/libde265-1.0.15
-RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR}
-RUN make -j $(nproc) && make install
+RUN curl -Ls -o libde265.tar.gz https://github.com/strukturag/libde265/releases/download/v${LIBDE265_VERSION}/libde265-${LIBDE265_VERSION}.tar.gz && tar xzf libde265.tar.gz && rm libde265.tar.gz \
+    && cd ${IMAGICK_BUILD_DIR}/libde265-${LIBDE265_VERSION} \
+    && ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} \
+    && make -j $(nproc) && make install && rm -rf ${IMAGICK_BUILD_DIR}/libde265-${LIBDE265_VERSION}
 
 # Compile libheif
-WORKDIR ${IMAGICK_BUILD_DIR}
-RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.13.0/libheif-1.13.0.tar.gz && tar xzf libheif.tar.gz
-WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.13.0
-RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR}
-RUN make -j $(nproc) && make install
+RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v${LIBHEIF_VERSION}/libheif-${LIBHEIF_VERSION}.tar.gz \
+    && tar xzf libheif.tar.gz && rm libheif.tar.gz && mkdir -p ${IMAGICK_BUILD_DIR}/libheif-${LIBHEIF_VERSION}/build && cd ${IMAGICK_BUILD_DIR}/libheif-${LIBHEIF_VERSION}/build \
+    && cmake --preset=release-noplugins .. -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
+    && make -j $(nproc) && make install && rm -rf ${IMAGICK_BUILD_DIR}/libheif-${LIBHEIF_VERSION}
 
 # Compile gs
-WORKDIR ${IMAGICK_BUILD_DIR}
-RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.gz && tar xzf ghostscript.tar.gz
-WORKDIR ${IMAGICK_BUILD_DIR}/ghostscript-9.56.1
-RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x
-RUN make -j $(nproc) && cp bin/gs /tmp/gs
+RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-${GS_VERSION}.tar.gz && tar xzf ghostscript.tar.gz && rm ghostscript.tar.gz \
+    && mkdir -p ${IMAGICK_BUILD_DIR}/ghostscript-${GS_VERSION} && cd ${IMAGICK_BUILD_DIR}/ghostscript-${GS_VERSION} \
+    && ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x \
+    && make -j $(nproc) && cp bin/gs /tmp/gs && rm -rf ${IMAGICK_BUILD_DIR}/ghostscript-${GS_VERSION}
 
 # Compile the ImageMagick library
-WORKDIR ${IMAGICK_BUILD_DIR}
-RUN curl -Ls -o ImageMagick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-38.tar.gz && tar xzf ImageMagick.tar.gz
-WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-38
-RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --with-webp --with-heic --disable-static --with-freetype=yes
-RUN make -j $(nproc)
-RUN make install
-
-# Show how ImageMagick is configured. See the "delicate" section
-RUN convert -list configure
-
-# Compile the php imagick extension
-WORKDIR ${IMAGICK_BUILD_DIR}
-RUN git clone https://github.com/Imagick/imagick
-WORKDIR ${IMAGICK_BUILD_DIR}/imagick
-# TODO; update the commit hash when there's a new release
-RUN git reset --hard 28f27044e435a2b203e32675e942eb8de620ee58
-RUN phpize
-RUN ./configure --with-imagick=${INSTALL_DIR}
-RUN make -j $(nproc)
-RUN make install
-
-RUN cp `php-config --extension-dir`/imagick.so /tmp/imagick.so
-RUN strip --strip-debug /tmp/imagick.so
-RUN echo 'extension=imagick.so' > /tmp/ext.ini
+RUN curl -Ls -o ImageMagick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/${IMAGICK_VERSION}.tar.gz && tar xzf ImageMagick.tar.gz && rm ImageMagick.tar.gz \
+    && cd ${IMAGICK_BUILD_DIR}/ImageMagick-${IMAGICK_VERSION} \
+    && ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --with-webp --with-heic --disable-static --with-freetype=yes \
+    && make -j $(nproc) && make install && rm -rf ${IMAGICK_BUILD_DIR}/ImageMagick-${IMAGICK_VERSION} && convert -list configure
 
-RUN php /bref/lib-copy/copy-dependencies.php /tmp/imagick.so /tmp/extension-libs
+# Compile the php imagick extension and copy the dependencies
+RUN git clone https://github.com/Imagick/imagick && cd imagick \
+    &&git reset --hard ${IMAGICK_EXT_COMMIT} \
+    && phpize && ./configure --with-imagick=${INSTALL_DIR} \
+    && make -j $(nproc) && make install && cp `php-config --extension-dir`/imagick.so /tmp/imagick.so && strip --strip-debug /tmp/imagick.so && echo 'extension=imagick.so' > /tmp/ext.ini \
+    && php /bref/lib-copy/copy-dependencies.php /tmp/imagick.so /tmp/extension-libs
 
 # Build the final image with just the files we need
 FROM scratch

From 6192495f5a96da68f382d6f20273e60fec738063 Mon Sep 17 00:00:00 2001
From: Dustin Wiemar <dustin@wiemar.eu>
Date: Sat, 16 Nov 2024 21:28:03 +0100
Subject: [PATCH 3/3] imagick: use platform independent gcc package

---
 layers/imagick/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile
index fc9b8a7c..0046ee17 100644
--- a/layers/imagick/Dockerfile
+++ b/layers/imagick/Dockerfile
@@ -15,7 +15,7 @@ ENV IMAGICK_EXT_COMMIT="28f27044e435a2b203e32675e942eb8de620ee58"
 ENV IMAGICK_BUILD_DIR=${BUILD_DIR}/imagick
 RUN mkdir -p ${IMAGICK_BUILD_DIR}
 WORKDIR ${IMAGICK_BUILD_DIR}
-RUN LD_LIBRARY_PATH= yum -y install libpng-devel libjpeg-devel lcms2-devel ImageMagick-devel nasm gcc10.x86_64 gcc10-c++.x86_64
+RUN LD_LIBRARY_PATH= yum -y install libpng-devel libjpeg-devel lcms2-devel ImageMagick-devel nasm gcc10 gcc10-c++
 
 # Use gcc10 as the default compiler, needed for AOM
 ENV CXX="/usr/bin/gcc10-g++"