diff options
| author |  Matthew Waters <matthew@centricular.com> | 2021-10-28 01:41:47 +1100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-27 10:41:47 -0400 |
| commit | 35d1d9722b525c0abbda72a20c1e8d39f0a9c2fc (patch) | |
| tree | 6128a65ada27382f2b3d25d972e418dfe6aabfb9 /projects/gstreamer | |
| parent | a3c588fcf3b3f45f8fc0bb68bcc1bcc5dbcaa3cb (diff) | |
gstreamer: update for git repository layout changes (#6654)
Diffstat (limited to 'projects/gstreamer')
| -rw-r--r-- | projects/gstreamer/Dockerfile | 12 | ||||
| -rwxr-xr-x | projects/gstreamer/build.sh | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/projects/gstreamer/Dockerfile b/projects/gstreamer/Dockerfile index 1a883485..4799c229 100644 --- a/projects/gstreamer/Dockerfile +++ b/projects/gstreamer/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update && \ apt-get install -y make autoconf automake libtool build-essential pkg-config bison flex gettext \ libffi-dev liblzma-dev libtheora-dev libogg-dev zlib1g-dev libcairo2-dev \ python3-pip ninja-build && \ - pip3 install meson==0.55.1 + pip3 install meson==0.59.0 # We must install libvorbis from scratch as otherwise we will run into # undefined functions in Ubuntu 20.04 @@ -33,14 +33,8 @@ RUN git clone --depth 1 https://gitlab.xiph.org/xiph/vorbis.git && \ ADD https://ftp.gnome.org/pub/gnome/sources/glib/2.64/glib-2.64.2.tar.xz $SRC -# Checkout all development repositories -#RUN for i in orc gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; do git clone --depth 1 --recursive https://anongit.freedesktop.org/git/gstreamer/$i $i; done -RUN \ - git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gstreamer.git gstreamer && \ - git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git gst-plugins-base && \ - git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gst-ci.git gst-ci - -RUN sed -i 's/theoraenc theoradec theora/theoraenc theoradec theora cairo/g' $SRC/gst-ci/fuzzing/build-oss-fuzz.sh +# Checkout repository +RUN git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gstreamer.git gstreamer ADD https://people.freedesktop.org/~bilboed/gst-discoverer_seed_corpus.zip $SRC diff --git a/projects/gstreamer/build.sh b/projects/gstreamer/build.sh index e18bb932..556f666c 100755 --- a/projects/gstreamer/build.sh +++ b/projects/gstreamer/build.sh @@ -15,4 +15,4 @@ # ################################################################################ -$SRC/gst-ci/fuzzing/build-oss-fuzz.sh +$SRC/gstreamer/ci/fuzzing/build-oss-fuzz.sh |