From e229b559d44b6316c7d5c17fddceed3a180a8fdf Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 15 Mar 2019 08:53:54 -0300 Subject: [PATCH] Revert "docker/fedora: use meson from fedora repos" This reverts commit a116f19eeb1d6cc40b2b9310c50c404ce407fcdd. --- docker/fedora/prepare.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index a328fb256b..d0000ccc9c 100644 --- a/docker/fedora/prepare.sh +++ b/docker/fedora/prepare.sh @@ -1,6 +1,6 @@ set -eu -dnf install -y git-core meson ninja-build dnf-plugins-core +dnf install -y git-core ninja-build dnf-plugins-core # Configure git for various usage git config --global user.email "gst-build@gstreamer.net" @@ -151,6 +151,10 @@ 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 \ @@ -165,7 +169,8 @@ dnf builddep -y gstreamer1 \ gstreamer1-libav \ gstreamer1-rtsp-server \ gstreamer1-vaapi \ - python3-gstreamer1 + python3-gstreamer1 \ + -x meson # Remove gst-devel packages installed by builddep above dnf remove -y "gstreamer1*devel"