From a1a80dd3c49bb110c295cea1cf3553b2e5a63104 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-vlc@jannau.net>
Date: Mon, 2 Sep 2019 07:55:21 +0200
Subject: [PATCH] dav1d: adapt build to upstream changes (#2791)

dav1d renamed the options build_asm and build_tools. build_asm=false
is no longer needed since the upstream fuzzer target disables the asm
code path when it runs under memory sanitizer.
Use enable_tools=false to skip building the dav1d CLI tools.
---
 projects/dav1d/build.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/projects/dav1d/build.sh b/projects/dav1d/build.sh
index a4b1b52ab..6c3d9ee22 100755
--- a/projects/dav1d/build.sh
+++ b/projects/dav1d/build.sh
@@ -23,15 +23,8 @@ rm -rf ${build}
 mkdir -p ${build}
 
 # build library
-BUILD_ASM="true"
 
-# MemorySanitizer may report false positives if used with asm code.
-if [[ $CFLAGS = *sanitize=memory* ]]
-then
-  BUILD_ASM="false"
-fi
-
-meson -Dbuild_asm=$BUILD_ASM -Dbuild_tools=false -Dfuzzing_engine=oss-fuzz \
+meson -Denable_tools=false -Dfuzzing_engine=oss-fuzz \
       -Db_lundef=false -Ddefault_library=static -Dbuildtype=debugoptimized \
       -Dlogging=false -Dfuzzer_ldflags=$LIB_FUZZING_ENGINE \
       ${build}