Skip to content

Commit e31c4c1

Browse files
committed
gstreamer: Fix Dockerfile and build.sh
Signed-off-by: Arthur Chan <arthur.chan@adalogics.com>
1 parent 6353d12 commit e31c4c1

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

projects/gstreamer/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
FROM gcr.io/oss-fuzz-base/base-builder
1717

1818
RUN apt-get update && \
19-
apt-get install -y make autoconf automake libtool build-essential pkg-config bison flex patchelf
19+
apt-get install -y make autoconf automake libtool build-essential pkg-config bison flex patchelf nasm
2020

2121
RUN pip3 install --disable-pip-version-check --no-cache-dir \
2222
pip==25.1.1
@@ -25,10 +25,6 @@ RUN pip3 install --disable-pip-version-check --no-cache-dir \
2525
meson==1.8.2 \
2626
ninja==1.11.1.4
2727

28-
RUN git clone --depth 1 https://gitlab.xiph.org/xiph/vorbis.git vorbis
29-
RUN git clone --depth 1 https://gitlab.xiph.org/xiph/ogg.git ogg
30-
RUN git clone --depth 1 https://gitlab.xiph.org/xiph/theora.git theora
31-
3228
# Checkout repository
3329
RUN git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gstreamer.git gstreamer
3430

projects/gstreamer/build.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,14 @@
1818
# gstreamer requires autoconf 2.71 minimum which is not available in the Ubuntu 20 base image
1919
# Skip this step if a newer base image is used
2020
if grep -q -F "20.04" /etc/os-release ; then
21-
cd /tmp
21+
pushd /tmp
2222
wget https://archive.ubuntu.com/ubuntu/pool/main/a/autoconf/autoconf_2.71-2_all.deb
2323
# Ensure file is not modified or corrupted before install
2424
if echo "96b528889794c4134015a63c75050f93d8aecdf5e3f2a20993c1433f4c61b80e autoconf_2.71-2_all.deb" | sha256sum --check --status ; then
2525
# Install but use G option to prevent downgrade in case this is
2626
dpkg -i -G /tmp/autoconf_2.71-2_all.deb
2727
fi
28+
popd
2829
fi
2930

30-
31-
# Fix Meson dependency error in ci/fuzzing/meson.build
32-
sed -i 's/extra_deps = dependency(target.get(2))/foreach d : target.get(2)\n extra_deps += dependency(d)\n endforeach/' $SRC/gstreamer/ci/fuzzing/meson.build
33-
3431
$SRC/gstreamer/ci/fuzzing/build-oss-fuzz.sh

0 commit comments

Comments
 (0)