Revert "docker: fedora: update to Fedora 31"

This is unused yet because it breaks some things

This reverts commit d016fa74531452c20d76f15d4fbfb31476837766.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/299>

diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
index 624cfcdcb86eeddbccb10d3238a4cc8f72847076..82abdd3a408afe3ab6baddedffcd7c157251cc5d 100644 (file)
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:31
+FROM registry.fedoraproject.org/fedora:30
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \

diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh
index 0ba80e1595c1ab18fd6ed5dc33f6444b07506b81..55f42d0e2b70e61cdb2857a503c1939db341d2c6 100644 (file)
--- a/docker/fedora/prepare.sh
+++ b/docker/fedora/prepare.sh
@@ -1,6 +1,6 @@
 set -eux
 
-dnf install -y git-core ninja-build dnf-plugins-core python3-pip
+dnf install -y git-core ninja-build dnf-plugins-core
 
 # Configure git for various usage
 git config --global user.email "gst-build@gstreamer.net"
@@ -17,6 +17,7 @@ dnf upgrade -y
 dnf install -y \
     aalib-devel \
     aom \
+    aom-extra-tools \
     bat \
     libaom \
     libaom-devel \
@@ -40,7 +41,6 @@ dnf install -y \
     graphene-devel \
     gsl \
     gsl-devel \
-    faac-devel \
     ffmpeg \
     ffmpeg-libs \
     ffmpeg-devel \
@@ -179,6 +179,7 @@ dnf builddep -y gstreamer1 \
     gstreamer1-plugins-good-extras \
     gstreamer1-plugins-ugly \
     gstreamer1-plugins-ugly-free \
+    gstreamer1-plugins-bad-nonfree \
     gstreamer1-plugins-bad-free \
     gstreamer1-plugins-bad-free-extras \
     gstreamer1-plugins-bad-freeworld \