From bafa12a24190fb7605159d4c0c7c9f33a1377756 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <lovell@users.noreply.github.com>
Date: Sun, 6 Sep 2020 16:03:39 +0100
Subject: [PATCH] [libheif] Add AOM as a dependency to enable AVIF fuzzing
 (#4414)

---
 projects/libheif/Dockerfile |  6 ++++++
 projects/libheif/build.sh   | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/projects/libheif/Dockerfile b/projects/libheif/Dockerfile
index 06eb81459..3c1a0d0e0 100644
--- a/projects/libheif/Dockerfile
+++ b/projects/libheif/Dockerfile
@@ -39,6 +39,12 @@ RUN hg clone \
     http://hg.videolan.org/x265 \
     x265
 
+RUN git clone \
+    --depth 1 \
+    --branch master \
+    https://aomedia.googlesource.com/aom \
+    aom
+
 RUN git clone \
     --depth 1 \
     --branch master \
diff --git a/projects/libheif/build.sh b/projects/libheif/build.sh
index d2aed395a..70618a2d2 100755
--- a/projects/libheif/build.sh
+++ b/projects/libheif/build.sh
@@ -45,6 +45,24 @@ make clean
 make -j$(nproc)
 make install
 
+mkdir -p $SRC/aom/build/linux
+cd $SRC/aom/build/linux
+cmake -G "Unix Makefiles" \
+  -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
+  -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+  -DCMAKE_INSTALL_PREFIX="$DEPS_PATH" \
+  -DENABLE_SHARED:bool=off -DCONFIG_PIC=1 \
+  -DENABLE_EXAMPLES=0 -DENABLE_DOCS=0 -DENABLE_TESTS=0 \
+  -DCONFIG_SIZE_LIMIT=1 \
+  -DDECODE_HEIGHT_LIMIT=12288 -DDECODE_WIDTH_LIMIT=12288 \
+  -DDO_RANGE_CHECK_CLAMP=1 \
+  -DAOM_MAX_ALLOCABLE_MEMORY=536870912 \
+  -DAOM_TARGET_CPU=generic \
+  ../../
+make clean
+make -j$(nproc)
+make install
+
 # Remove shared libraries to avoid accidental linking against them.
 rm -f $DEPS_PATH/lib/*.so
 rm -f $DEPS_PATH/lib/*.so.*