From 36d589d9d50dd2aa9209ee438131e0e9fa0447ac Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Sun, 20 Mar 2022 03:53:34 +1100 Subject: [PATCH] gstreamer: update meson version requirements (#7397) * gstreamer: update meson version requirements Fixes build error: ./../src/gstreamer/meson.build:1:0: ERROR: Meson version is 0.59.0 but project requires >= 0.60.0 * gstreamer: update glib to 2.72.0 Fixes a divide by zero when configuring the internal gnulib. --- projects/gstreamer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/gstreamer/Dockerfile b/projects/gstreamer/Dockerfile index 4799c229a..55f6efbb5 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.59.0 + pip3 install meson==0.61.3 # We must install libvorbis from scratch as otherwise we will run into # undefined functions in Ubuntu 20.04 @@ -31,7 +31,7 @@ RUN git clone --depth 1 https://gitlab.xiph.org/xiph/vorbis.git && \ make -j$(nproc) && \ make install -ADD https://ftp.gnome.org/pub/gnome/sources/glib/2.64/glib-2.64.2.tar.xz $SRC +ADD https://ftp.gnome.org/pub/gnome/sources/glib/2.72/glib-2.72.0.tar.xz $SRC # Checkout repository RUN git clone --depth 1 --recursive https://gitlab.freedesktop.org/gstreamer/gstreamer.git gstreamer