Skip to content

gstreamer: Fix Dockerfile and build.sh #15476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
arthurscchan wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

gstreamer: Fix Dockerfile and build.sh #15476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions projects/gstreamer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
FROM gcr.io/oss-fuzz-base/base-builder

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

RUN pip3 install --disable-pip-version-check --no-cache-dir \
pip==25.1.1
Expand All @@ -25,10 +25,6 @@ RUN pip3 install --disable-pip-version-check --no-cache-dir \
meson==1.8.2 \
ninja==1.11.1.4

RUN git clone --depth 1 https://gitlab.xiph.org/xiph/vorbis.git vorbis
RUN git clone --depth 1 https://gitlab.xiph.org/xiph/ogg.git ogg
RUN git clone --depth 1 https://gitlab.xiph.org/xiph/theora.git theora

# Checkout repository
RUN git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gstreamer.git gstreamer

Expand Down
7 changes: 2 additions & 5 deletions projects/gstreamer/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@
# gstreamer requires autoconf 2.71 minimum which is not available in the Ubuntu 20 base image
# Skip this step if a newer base image is used
if grep -q -F "20.04" /etc/os-release ; then
cd /tmp
pushd /tmp
wget https://archive.ubuntu.com/ubuntu/pool/main/a/autoconf/autoconf_2.71-2_all.deb
# Ensure file is not modified or corrupted before install
if echo "96b528889794c4134015a63c75050f93d8aecdf5e3f2a20993c1433f4c61b80e autoconf_2.71-2_all.deb" | sha256sum --check --status ; then
# Install but use G option to prevent downgrade in case this is
dpkg -i -G /tmp/autoconf_2.71-2_all.deb
fi
popd
fi


# Fix Meson dependency error in ci/fuzzing/meson.build
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

$SRC/gstreamer/ci/fuzzing/build-oss-fuzz.sh
Loading