Skip to content

Commit

Permalink
vlc: enable xml_plugin and ogg_plugin
Browse files Browse the repository at this point in the history
Install libogg-dev libopus-dev libxml2-dev
  • Loading branch information
tguillem committed Feb 6, 2025
1 parent f427410 commit a923b2b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
3 changes: 2 additions & 1 deletion projects/vlc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

FROM gcr.io/oss-fuzz-base/base-builder
RUN apt-get update && apt-get install -y make autoconf automake libtool \
pkg-config cmake flex bison gettext libglu1-mesa-dev libmatroska-dev
pkg-config cmake flex bison gettext libglu1-mesa-dev libmatroska-dev \
libogg-dev libopus-dev libxml2-dev
RUN git clone --depth 1 https://code.videolan.org/videolan/vlc.git vlc
RUN git clone --depth 1 https://code.videolan.org/VideoLAN.org/vlc-fuzz-corpus.git vlc/fuzz-corpus
WORKDIR vlc
Expand Down
7 changes: 1 addition & 6 deletions projects/vlc/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@ sed -i 's/-fsanitize-coverage=trace-cmp//g' ./configure.ac
sed -i 's/-fsanitize-coverage=trace-pc//g' ./configure.ac
sed -i 's/-lFuzzer//g' ./configure.ac

# In order to build statically we avoid libxml and ogg plugins.
sed -i 's/..\/..\/lib\/libvlc_internal.h/lib\/libvlc_internal.h/g' ./test/src/input/decoder.c
sed -i 's/..\/modules\/libxml_plugin.la//g' ./test/Makefile.am
sed -i 's/..\/modules\/libogg_plugin.la//g' ./test/Makefile.am
sed -i 's/f(misc_xml_xml)//g' ./test/src/input/demux-run.c
sed -i 's/f(demux_ogg)//g' ./test/src/input/demux-run.c

# Ensure that we compile with the correct link flags.
RULE="vlc_demux_libfuzzer_LDADD"
Expand All @@ -42,7 +37,7 @@ sed -i "s/${RULE}/${FUZZ_LDFLAGS}\n${RULE}/g" ./test/Makefile.am
# Use libstdc++, not libc++, since the base image's prebuild libraries require
# libstdc++.
CXXFLAGS="$CXXFLAGS -stdlib=libstdc++" \
./configure --disable-ogg --disable-oggspots --disable-libxml2 --disable-lua \
./configure --disable-lua \
--disable-shared \
--enable-static \
--enable-vlc=no \
Expand Down

0 comments on commit a923b2b

Please sign in to comment.