Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Michael Niedermayer 2019-10-27 19:29:31 +01:00 committed by Abhishek Arya
parent d898cef4c6
commit 1a908bd175
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/ffmpeg/Dockerfile
View File

@ -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 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 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 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/xorg/lib/libXext
RUN git clone --depth 1 git://anongit.freedesktop.org/git/xorg/lib/libXfixes RUN git clone --depth 1 git://anongit.freedesktop.org/git/xorg/lib/libXfixes

8
projects/ffmpeg/build.sh
View File

@ -35,14 +35,6 @@ make clean
make -j$(nproc) all make -j$(nproc) all
make install 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 cd $SRC/fdk-aac
autoreconf -fiv autoreconf -fiv
CXXFLAGS="$CXXFLAGS -fno-sanitize=shift-base,signed-integer-overflow" \ CXXFLAGS="$CXXFLAGS -fno-sanitize=shift-base,signed-integer-overflow" \