From 54fe0d311dd5f6b0820c081cdd039bda79815f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 26 Jun 2019 11:20:20 +0200 Subject: [PATCH] ci/Dockerfile: Add mesa crash fix This applies 'egl/x11: calloc dri2_surf so it's properly zeroed' to mesa-19.0.7, as it fixes a crash introduced by 'egl/dri: flesh out and use dri2_create_drawable()' included in 19.0.6. https://gitlab.gnome.org/GNOME/mutter/merge_requests/648 --- .gitlab-ci/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 5bae53be9..f49f1a3c0 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -11,6 +11,7 @@ RUN dnf -y update && dnf -y upgrade && \ dnf install -y 'dnf-command(builddep)' && \ dnf install -y 'dnf-command(copr)' && \ dnf copr enable -y fmuellner/gnome-shell-ci && \ + dnf copr enable -y jadahl/mutter-ci && \ dnf copr enable -y hergertme/sysprof-3 && \ dnf builddep -y mutter && \ @@ -18,6 +19,9 @@ RUN dnf -y update && dnf -y upgrade && \ # Until Fedora catches up with meson build-deps dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \ + # Until Fedora catches up with mesa bug fixes + dnf upgrade -y mesa-dri-drivers mesa-libEGL && \ + # For running unit tests dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib accountsservice-libs && \