From 18c410f969beefe3b54bca2f608ec1fb75fa4cdb Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Tue, 6 May 2025 13:19:36 +0200 Subject: [PATCH] Mesa 25.0.4 --- ...Revert-kopper-Explicitly-choose-zink.patch | 46 +++++++++++++++++++ my-ostree-os/mesa/mesa.spec | 12 +++-- 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 my-ostree-os/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch diff --git a/my-ostree-os/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch b/my-ostree-os/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch new file mode 100644 index 0000000..954389e --- /dev/null +++ b/my-ostree-os/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch @@ -0,0 +1,46 @@ +From 24f85c06c28736b73c14208a0ffa6657d2aee9cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= +Date: Mon, 21 Apr 2025 13:52:14 +0200 +Subject: [PATCH] Revert "kopper: Explicitly choose zink" + +On QEMU (virtio driver), without 3D acceleration enabled and without +mesa-vulkan-drivers installed, this commit prevents Mutter to start. + +This reverts commit c0bc957c5d8c7edd57626284b712dd6ea1e375fc. + +Related: https://bugzilla.redhat.com/show_bug.cgi?id=2360851 +Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009 +--- + .pick_status.json | 2 +- + src/gallium/frontends/dri/kopper.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.pick_status.json b/.pick_status.json +index 99df2fb30c2..cdf3965678c 100644 +--- a/.pick_status.json ++++ b/.pick_status.json +@@ -16204,7 +16204,7 @@ + "description": "kopper: Explicitly choose zink", + "nominated": false, + "nomination_type": 0, +- "resolution": 1, ++ "resolution": 4, + "main_sha": null, + "because_sha": null, + "notes": null +diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c +index a1d7dcb79b4..3bdb56022a9 100644 +--- a/src/gallium/frontends/dri/kopper.c ++++ b/src/gallium/frontends/dri/kopper.c +@@ -73,7 +73,7 @@ kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred) + bool success; + #ifdef HAVE_LIBDRM + if (screen->fd != -1) +- success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, true); ++ success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, false); + else + success = pipe_loader_vk_probe_dri(&screen->dev); + #else +-- +2.49.0 + diff --git a/my-ostree-os/mesa/mesa.spec b/my-ostree-os/mesa/mesa.spec index dbb741a..74001be 100644 --- a/my-ostree-os/mesa/mesa.spec +++ b/my-ostree-os/mesa/mesa.spec @@ -69,7 +69,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 25.0.3 +%global ver 25.0.4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 10.clang.skylake%{?dist} License: MIT AND BSD-3-Clause AND SGI-B-2.0 @@ -96,6 +96,12 @@ Patch24: 0004-vulkan-wsi-handle-the-compositor-not-supporting-exte.patch Patch25: 0001-meson-update-wayland-protocols-source_hash.patch Patch26: 0001-docs-features-add-VK_EXT_hdr_metadata.patch +# This patch makes Fedora CI fail and causes issues in QEMU. Revert it until +# we find a fix. +# https://bugzilla.redhat.com/show_bug.cgi?id=2360851 +# https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009 +Patch30: 0001-Revert-kopper-Explicitly-choose-zink.patch + BuildRequires: meson >= 1.3.0 BuildRequires: gcc BuildRequires: gcc-c++ @@ -405,9 +411,9 @@ CFLAGS="$CFLAGS -march=skylake -mtune=skylake -O3" CXXFLAGS="$CXXFLAGS -march=sk -Dosmesa=true \ --buildtype=release \ %if 0%{?with_hardware} - -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \ + -Dgallium-drivers=llvmpipe,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \ %else - -Dgallium-drivers=swrast,virgl \ + -Dgallium-drivers=llvmpipe,virgl \ %endif -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \ -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \