From 26a5fd491655f323faa8eaa8f2679300b1e2fda7 Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Mon, 29 Aug 2022 14:20:05 +0200
Subject: [PATCH] Add libjxl to the build of ImageMagick and removed i386
 architecture. (#8363)

* Add libjxl to the build of ImageMagick.

* Removed i386 architecture.

* Removed specific settings.
---
 projects/imagemagick/Dockerfile   | 6 +++---
 projects/imagemagick/project.yaml | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/projects/imagemagick/Dockerfile b/projects/imagemagick/Dockerfile
index 6837f2d3a..7e486e509 100644
--- a/projects/imagemagick/Dockerfile
+++ b/projects/imagemagick/Dockerfile
@@ -17,7 +17,6 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && \
     apt-get install -y make autoconf automake groff libtool pkg-config cmake nasm autopoint
-RUN apt-get install -y libc6-dev:i386
 RUN git clone --depth 1 https://github.com/imagemagick/imagemagick
 RUN git clone --depth 1 https://gitlab.com/libtiff/libtiff
 RUN git clone --depth 1 https://github.com/strukturag/libde265
@@ -26,14 +25,15 @@ RUN git clone --depth 1 https://github.com/uclouvain/openjpeg
 RUN git clone --depth 1 https://github.com/webmproject/libwebp
 RUN git clone --depth 1 https://github.com/madler/zlib
 RUN git clone --depth 1 https://github.com/libjpeg-turbo/libjpeg-turbo
-RUN git clone https://git.savannah.nongnu.org/r/freetype/freetype2.git/
 RUN git clone --depth 1 https://github.com/xz-mirror/xz
 RUN git clone --depth 1 https://github.com/libraw/libraw
 RUN git clone --depth 1 https://github.com/pnggroup/libpng
 RUN git clone --depth 1 https://github.com/mm2/Little-CMS
+RUN git clone --depth 1 https://gitlab.com/federicomenaquintero/bzip2.git
+RUN git clone --depth 1 --recursive https://github.com/libjxl/libjxl
+RUN git clone https://git.savannah.nongnu.org/r/freetype/freetype2.git/
 RUN git clone https://www.cl.cam.ac.uk/~mgk25/git/jbigkit # does not support shallow
 RUN svn export https://github.com/mozillasecurity/fuzzdata.git/trunk/samples/heic heic_corpus
-RUN git clone --depth 1 https://gitlab.com/federicomenaquintero/bzip2.git
 ADD https://lcamtuf.coredump.cx/afl/demo/afl_testcases.tgz afl_testcases.tgz
 WORKDIR imagemagick
 COPY build.sh $SRC/
diff --git a/projects/imagemagick/project.yaml b/projects/imagemagick/project.yaml
index 7fcebca49..4ae485ffd 100644
--- a/projects/imagemagick/project.yaml
+++ b/projects/imagemagick/project.yaml
@@ -10,7 +10,4 @@ sanitizers:
   - address
   - memory
   - undefined
-architectures:
-  - x86_64
-  - i386
 main_repo: 'https://github.com/imagemagick/imagemagick'