From abd310845adb840fb459a47f3423f8f10fcb4549 Mon Sep 17 00:00:00 2001
From: Vincent Rabaud <vrabaud@google.com>
Date: Mon, 19 Feb 2024 15:17:54 +0100
Subject: [PATCH] Modify cmd files to minimize diff

---
 tests/oss-fuzz/build.sh | 44 ++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/tests/oss-fuzz/build.sh b/tests/oss-fuzz/build.sh
index b494f25756..e8533e5374 100755
--- a/tests/oss-fuzz/build.sh
+++ b/tests/oss-fuzz/build.sh
@@ -36,23 +36,6 @@
 #     avif_fuzztest_enc_dec_incr@EncodeDecodeAvifFuzzTest.EncodeDecodeGridValid \
 #     --sanitizer address
 
-# Build dav1d with sanitizer flags.
-# This duplicates dav1d.cmd but includes extra flags: -Db_sanitize=$SANITIZER -Db_lundef=false,
-# and -Denable_asm=false for msan
-cd ext
-git clone -b 1.4.0 --depth 1 https://code.videolan.org/videolan/dav1d.git
-cd dav1d
-mkdir build
-cd build
-export DAV1D_FLAGS="--default-library=static --buildtype release -Denable_tools=false -Denable_tests=false -Db_sanitize=$SANITIZER -Db_lundef=false"
-if [ "$SANITIZER" == "memory" ]
-then
-  export DAV1D_FLAGS="${DAV1D_FLAGS} -Denable_asm=false"
-fi
-meson setup ${DAV1D_FLAGS} ..
-ninja
-cd ../../..
-
 # Reset compile flags to build libyuv without fuzzer flags.
 export ORIG_CFLAGS="$CFLAGS"
 export ORIG_CXXFLAGS="$CXXFLAGS"
@@ -64,26 +47,25 @@ cd ext && bash libyuv.cmd && cd ..
 export CFLAGS=$ORIG_CFLAGS
 export CXXFLAGS=$ORIG_CXXFLAGS
 
+# Build dav1d with sanitizer flags.
+# Adds extra flags: -Db_sanitize=$SANITIZER -Db_lundef=false, and -Denable_asm=false for msan
+export DAV1D_EXTRA_FLAGS="-Db_sanitize=$SANITIZER -Db_lundef=false"
+if [ "$SANITIZER" == "memory" ]
+then
+  export DAV1D_EXTRA_FLAGS="${DAV1D_EXTRA_FLAGS} -Denable_asm=false"
+fi
+sed -i 's/meson setup \(.*\) ../meson setup \1 '"${DAV1D_EXTRA_FLAGS}"' ../g' ./ext/dav1d.cmd
+
 # Build libaom with sanitizer flags.
-# This duplicates aom.cmd but adds extra flags: -DAOM_TARGET_CPU=generic for msan.
+# Adds extra flags: -DAOM_TARGET_CPU=generic for msan.
 if [ "$SANITIZER" == "memory" ]
 then
-  cd ext
-  git clone -b v3.8.1 --depth 1 https://aomedia.googlesource.com/aom
-  cd aom
-  mkdir build.libavif
-  cd build.libavif
-  # Use -DAOM_TARGET_CPU=generic to disable assembly.
-  cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCONFIG_PIC=1 -DCMAKE_BUILD_TYPE=Release -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DAOM_TARGET_CPU=generic ..
-  ninja
-  cd ../../..
-else
-  cd ext && bash aom.cmd && cd ..
+  sed -i 's/cmake \(.*\) ../cmake \1 -DAOM_TARGET_CPU=generic ../g' ./ext/aom.cmd
 fi
 
 # Prepare remaining dependencies.
-cd ext && bash fuzztest.cmd && bash libjpeg.cmd && bash libsharpyuv.cmd &&
-      bash zlibpng.cmd && cd ..
+cd ext && bash aom.cmd && bash dav1d.cmd && bash fuzztest.cmd && bash libjpeg.cmd &&
+      bash libsharpyuv.cmd && bash zlibpng.cmd && cd ..
 
 # build libavif
 mkdir build