From 0ffe67ffed18a379235d504f3e22e2eaf082d5a9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Jan 2021 11:04:38 -0500 Subject: [PATCH 1/3] ci: Add libglvnd-devel to images gstreamers gl support included headers from this package without depending on it. Work around this packaging error by explicitly adding the needed dependencies. --- .gitlab-ci/fedora-base.Dockerfile | 1 + .gitlab-ci/fedora.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile index 7719fe5e56..f61a8fc3cf 100644 --- a/.gitlab-ci/fedora-base.Dockerfile +++ b/.gitlab-ci/fedora-base.Dockerfile @@ -47,6 +47,7 @@ RUN dnf -y install \ libcloudproviders-devel \ libepoxy-devel \ libffi-devel \ + libglvnd-devel \ libmount-devel \ librsvg2 \ libselinux-devel \ diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index a7a35b4299..e380ef78d7 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25 +FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26 # Enable sudo for wheel users RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers From 454caa3eecddf7a6f1030bfb2ca82d5e97ebc74b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Jan 2021 11:14:54 -0500 Subject: [PATCH 2/3] ci: Use v26 of the Fedora image This includes libglvnd-devel and should fix using the gstreamer gl support. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f662c3a7f..7514359ed3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v26" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25" From b37a69d76c59a466f35a6ee28d60fa2d444b5d87 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Jan 2021 12:49:20 -0500 Subject: [PATCH 3/3] ci: Add mesa-libGLES-devel Try again, since libglvnd-devel is not the right choice. --- .gitlab-ci.yml | 2 +- .gitlab-ci/fedora-base.Dockerfile | 2 +- .gitlab-ci/fedora.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7514359ed3..00624776e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v26" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v27" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master" DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25" diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile index f61a8fc3cf..613d492d34 100644 --- a/.gitlab-ci/fedora-base.Dockerfile +++ b/.gitlab-ci/fedora-base.Dockerfile @@ -47,7 +47,6 @@ RUN dnf -y install \ libcloudproviders-devel \ libepoxy-devel \ libffi-devel \ - libglvnd-devel \ libmount-devel \ librsvg2 \ libselinux-devel \ @@ -66,6 +65,7 @@ RUN dnf -y install \ libxslt \ mesa-dri-drivers \ mesa-libEGL-devel \ + mesa-libGLES-devel \ mesa-libwayland-egl-devel \ ninja-build \ pango-devel \ diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index e380ef78d7..ddcc18f287 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26 +FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27 # Enable sudo for wheel users RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers