From 404fce66ab8597183d51b53f188fc9c88cd03078 Mon Sep 17 00:00:00 2001
From: Abhishek Arya <inferno@chromium.org>
Date: Wed, 24 May 2017 00:56:59 -0700
Subject: [ffmpeg] Fix build breakage due to nasm >= 2.13. (#620)

---
 projects/ffmpeg/Dockerfile |  3 ++-
 projects/ffmpeg/build.sh   | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'projects/ffmpeg')

diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile
index 05916a43..04158cd2 100644
--- a/projects/ffmpeg/Dockerfile
+++ b/projects/ffmpeg/Dockerfile
@@ -19,12 +19,13 @@ MAINTAINER mmoroz@chromium.org
 RUN apt-get update && apt-get install -y make autoconf automake libtool build-essential \
     libass-dev libfreetype6-dev libsdl1.2-dev \
     libvdpau-dev libxcb1-dev libxcb-shm0-dev \
-    pkg-config texinfo libbz2-dev zlib1g-dev nasm yasm cmake mercurial wget \
+    pkg-config texinfo libbz2-dev zlib1g-dev yasm cmake mercurial wget \
     xutils-dev libpciaccess-dev
 
 RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 
 RUN wget ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.0.tar.bz2
+RUN wget http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.gz
 RUN git clone git://anongit.freedesktop.org/mesa/drm
 RUN git clone https://github.com/mstorsjo/fdk-aac.git
 ADD https://sourceforge.net/projects/lame/files/latest/download lame.tar.gz
diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh
index 8f15879c..40219068 100755
--- a/projects/ffmpeg/build.sh
+++ b/projects/ffmpeg/build.sh
@@ -23,6 +23,16 @@ export CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr"
 export FFMPEG_DEPS_PATH=$SRC/ffmpeg_deps
 mkdir -p $FFMPEG_DEPS_PATH
 
+# Build latest nasm without memory instrumentation.
+cd $SRC
+tar xzf nasm-*
+cd nasm-*
+CFLAGS="" CXXFLAGS="" ./configure --prefix="$FFMPEG_DEPS_PATH"
+make clean
+make -j$(nproc)
+make install
+export PATH=$FFMPEG_DEPS_PATH/bin:$PATH
+
 cd $SRC
 bzip2 -f -d alsa-lib-*
 tar xf alsa-lib-*
-- 
cgit v1.2.3