From a116f19eeb1d6cc40b2b9310c50c404ce407fcdd Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 14 Mar 2019 02:42:15 +0200 Subject: [PATCH] docker/fedora: use meson from fedora repos Fedora is still on version 0.49.2 while pip is on 0.50. With the version from pip we can no longer run some gst-sharp tests so we essentially revert back to 0.49 https://github.com/mesonbuild/meson/issues/5087 --- docker/fedora/prepare.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index e8883fa704..4f31888c3c 100644 --- a/docker/fedora/prepare.sh +++ b/docker/fedora/prepare.sh @@ -1,6 +1,6 @@ set -eu -dnf install -y git ninja-build dnf-plugins-core +dnf install -y git meson ninja-build dnf-plugins-core # Configure git for various usage git config --global user.email "gst-build@gstreamer.net" @@ -150,10 +150,6 @@ dnf debuginfo-install -y gtk3 \ zip \ zlib -pip3 install meson -# Add the pip3 installation to the path -export PATH="$PATH:/usr/local/lib/python3.7/site-packages" - # Install the dependencies of gstreamer dnf builddep -y gstreamer1 \ gstreamer1-plugins-base \ @@ -168,8 +164,7 @@ dnf builddep -y gstreamer1 \ gstreamer1-libav \ gstreamer1-rtsp-server \ gstreamer1-vaapi \ - python3-gstreamer1 \ - -x meson + python3-gstreamer1 # Remove gst-devel packages installed by builddep above dnf remove -y "gstreamer1*devel"