From 7814d1fd759118f2fb402ba23f73fd6c30b46592 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 8 Aug 2024 14:18:41 -0400
Subject: [PATCH] ci: Fix a Vulkan problem in the F40 image

Drop the powervr Vulkan driver, which otherwise interferes with
proper functioning of our ci.
---
 .gitlab-ci.yml               | 2 +-
 .gitlab-ci/fedora.Dockerfile | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc39d3cf62..fee746d85c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v51"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v52"
 
 workflow:
   rules:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index c4f86e7e99..88167f4056 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -99,7 +99,10 @@ RUN dnf -y install \
     which \
     wireplumber \
     xorg-x11-server-Xvfb \
- && dnf update && :dnf clean all
+ && dnf -y update \
+ && dnf clean all
+
+RUN rm /usr/share/vulkan/icd.d/powervr_mesa_icd.x86_64.json
 
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers