From 5dce77d6b9dfb667723c2ab32d8639a3cbc45a7a Mon Sep 17 00:00:00 2001 From: "James P. Ketrenos" Date: Fri, 25 Sep 2020 14:45:53 -0700 Subject: [PATCH] yasm has been deprecated for x86asm Signed-off-by: James P. Ketrenos --- Dockerfile.solution | 2 +- Dockerfile.solution.rhel | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile.solution b/Dockerfile.solution index 767797a..547a0b1 100644 --- a/Dockerfile.solution +++ b/Dockerfile.solution @@ -39,7 +39,7 @@ RUN git clone --depth 1 --branch $FFMPEG_TAG_VERSION https://github.com/ffmpeg/f # Build FFmpeg WORKDIR /home/user/ffmpeg -RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \ +RUN ./configure --arch=x86_64 --disable-x86asm --enable-vaapi --enable-libmfx \ && make -j $(nproc --all) \ && sudo make install diff --git a/Dockerfile.solution.rhel b/Dockerfile.solution.rhel index 6822985..114e85d 100644 --- a/Dockerfile.solution.rhel +++ b/Dockerfile.solution.rhel @@ -1,11 +1,6 @@ # Docker.solution based on the Intel-Media-SDK instructions available here: # # https://github.com/Intel-Media-SDK/MediaSDK/wiki/Build-and-use-ffmpeg-with-MediaSDK -# -# This should really be part of a multi-stage build so the final -# image isn't polluted with build artifacts -# -# NOTE: This image will only work with Ubuntu 19.04 (eoan) and newer FROM xe-user-stage AS solution-build USER root @@ -31,7 +26,7 @@ WORKDIR /home/user/ffmpeg ENV LIBVA_DRIVER_NAME=iHD -RUN ./configure --arch=x86_64 --disable-yasm --enable-vaapi --enable-libmfx \ +RUN ./configure --arch=x86_64 --disable-x86asm --enable-vaapi --enable-libmfx \ && make -j $(nproc --all) \ && sudo make install