diff options
| author |  Michael Niedermayer <michaelni@users.noreply.github.com> | 2019-10-27 19:29:31 +0100 |
|---|---|---|
| committer |  Abhishek Arya <inferno@chromium.org> | 2019-10-27 11:29:31 -0700 |
| commit | 1a908bd175a276833271dadfcce84065c5385876 (patch) | |
| tree | b0511a4874085b6a6177d3d2c470c48796f97395 /projects | |
| parent | d898cef4c6dd53e5d46993df0747920ca1c4f9be (diff) | |
[ffmpeg] Drop mesa/drm, it does not build due to changes to its build system (#2983)
Fixes issue 18386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/ffmpeg/Dockerfile | 1 | ||||
| -rwxr-xr-x | projects/ffmpeg/build.sh | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile index f6367d40..5226dd77 100644 --- a/projects/ffmpeg/Dockerfile +++ b/projects/ffmpeg/Dockerfile @@ -27,7 +27,6 @@ RUN apt-get update && apt-get install -y make autoconf automake libtool build-es RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg RUN wget https://www.alsa-project.org/files/pub/lib/alsa-lib-1.1.0.tar.bz2 -RUN git clone --depth 1 git://anongit.freedesktop.org/mesa/drm RUN git clone --depth 1 https://github.com/mstorsjo/fdk-aac.git RUN git clone --depth 1 git://anongit.freedesktop.org/xorg/lib/libXext RUN git clone --depth 1 git://anongit.freedesktop.org/git/xorg/lib/libXfixes diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh index 02d96076..ac9b66dd 100755 --- a/projects/ffmpeg/build.sh +++ b/projects/ffmpeg/build.sh @@ -35,14 +35,6 @@ make clean make -j$(nproc) all make install -cd $SRC/drm -# Requires xutils-dev libpciaccess-dev -./autogen.sh -./configure --prefix="$FFMPEG_DEPS_PATH" --enable-static -make clean -make -j$(nproc) -make install - cd $SRC/fdk-aac autoreconf -fiv CXXFLAGS="$CXXFLAGS -fno-sanitize=shift-base,signed-integer-overflow" \ |