From a923b2b10c92f5b4c4badc01bbc62a623b9caaae Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Thu, 6 Feb 2025 15:01:22 +0100 Subject: [PATCH] vlc: enable xml_plugin and ogg_plugin Install libogg-dev libopus-dev libxml2-dev --- projects/vlc/Dockerfile | 3 ++- projects/vlc/build.sh | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/projects/vlc/Dockerfile b/projects/vlc/Dockerfile index bee1e7c4c0e2..70539598ca0d 100644 --- a/projects/vlc/Dockerfile +++ b/projects/vlc/Dockerfile @@ -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 diff --git a/projects/vlc/build.sh b/projects/vlc/build.sh index d1415fd8d725..43296fbbdd3a 100755 --- a/projects/vlc/build.sh +++ b/projects/vlc/build.sh @@ -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" @@ -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 \