From cfb7dae72fecca1b60491844e11dbc0ef750a795 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Fri, 20 Jun 2025 10:09:42 -0700
Subject: [PATCH] fix: Update mesa.spec with latest changes from upstream
 (#5601)

* fix: Update mesa.spec with latest changes from upstream

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

* chore: Remove unneeded patch

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

* chore: Remove unused patch file

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

* chore: Update bazzite.patch

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>

---------

Signed-off-by: Kyle Gospodnetich <me@kylegospodneti.ch>
---
 ...Revert-kopper-Explicitly-choose-zink.patch | 32 -----------
 anda/lib/mesa/bazzite.patch                   | 38 ++++++-------
 anda/lib/mesa/mesa.spec                       | 53 ++++++++++++-------
 3 files changed, 53 insertions(+), 70 deletions(-)
 delete mode 100644 anda/lib/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch

diff --git a/anda/lib/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch b/anda/lib/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch
deleted file mode 100644
index d595c30c5f..0000000000
--- a/anda/lib/mesa/0001-Revert-kopper-Explicitly-choose-zink.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 24f85c06c28736b73c14208a0ffa6657d2aee9cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com>
-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
----
- src/gallium/frontends/dri/kopper.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-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/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch
index 5cd2bdf1df..009479fd97 100644
--- a/anda/lib/mesa/bazzite.patch
+++ b/anda/lib/mesa/bazzite.patch
@@ -1,4 +1,4 @@
-From 15d9496c44df8c20128127e8ccb8856d5b7c8c29 Mon Sep 17 00:00:00 2001
+From 27e5ca5e9f32a3dab5d9f22e53c34133a98fc1ef Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:38:53 +0100
 Subject: [PATCH 01/11] [NA] Developer files, readme, etc
@@ -238,7 +238,7 @@ index 00000000000..f0fa113f876
 2.49.0
 
 
-From 0d1d997dfc1c7ae6321544cb54cd0fae443d13bd Mon Sep 17 00:00:00 2001
+From 2f02ad01e44eddb1d78e6e2a336bb21b7c3c93af Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:39:08 +0100
 Subject: [PATCH 02/11] [BEGIN] SteamOS Changes
@@ -247,7 +247,7 @@ Subject: [PATCH 02/11] [BEGIN] SteamOS Changes
 2.49.0
 
 
-From 4cace3e7b524fe399a0f970cddff8298ed5d8848 Mon Sep 17 00:00:00 2001
+From d446cc1258a6c6fd042e9a3d651a799a033a2d8c Mon Sep 17 00:00:00 2001
 From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
 Date: Fri, 14 Jan 2022 15:58:45 +0100
 Subject: [PATCH 03/11] STEAMOS: radv: min image count override for FH5
@@ -259,10 +259,10 @@ gamescope the game could get stuck in low power states.
  1 file changed, 4 insertions(+)
 
 diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
-index f4933bef04e..595a435802f 100644
+index e0e5b34dc87..5e931f61760 100644
 --- a/src/util/00-radv-defaults.conf
 +++ b/src/util/00-radv-defaults.conf
-@@ -230,5 +230,9 @@ Application bugs worked around in this file:
+@@ -238,5 +238,9 @@ Application bugs worked around in this file:
          <application name="Total War: WARHAMMER III" application_name_match="TotalWarhammer3">
              <option name="radv_disable_depth_storage" value="true"/>
          </application>
@@ -276,7 +276,7 @@ index f4933bef04e..595a435802f 100644
 2.49.0
 
 
-From ecc936c2cc8bd40dae8e0a72a0be20ac2013b135 Mon Sep 17 00:00:00 2001
+From 016b60d32de3cd99e10207e7f0fa2c6fce91476c Mon Sep 17 00:00:00 2001
 From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
 Date: Thu, 22 Feb 2024 22:32:45 +0100
 Subject: [PATCH 04/11] STEAMOS: Dynamic swapchain override for gamescope
@@ -383,7 +383,7 @@ index 4da19d73090..819a0e548fc 100644
 2.49.0
 
 
-From 748118300fed8a077fe78b121e2440f9a5e94b86 Mon Sep 17 00:00:00 2001
+From 23db9ff0bf721f2c9080955c8c5dcf1f187d7adc Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:39:25 +0100
 Subject: [PATCH 05/11] [BEGIN] SteamOS Backports
@@ -392,7 +392,7 @@ Subject: [PATCH 05/11] [BEGIN] SteamOS Backports
 2.49.0
 
 
-From ac2264f9364e2660618f9c6c65ffeb6cc582d8c9 Mon Sep 17 00:00:00 2001
+From 69160c86a0d01b1c8482277faca1f6f7fa24cfce Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Sat, 15 Mar 2025 16:39:33 +0100
 Subject: [PATCH 06/11] [BEGIN] Our Mesa backports
@@ -401,7 +401,7 @@ Subject: [PATCH 06/11] [BEGIN] Our Mesa backports
 2.49.0
 
 
-From daaf7be9a252e1a2fd217114e395dfe65e473784 Mon Sep 17 00:00:00 2001
+From 59e3d359a4f4f78112ee965bb790dec2208ea480 Mon Sep 17 00:00:00 2001
 From: Maarten Lankhorst <maarten.lankhorst@intel.com>
 Date: Mon, 17 Feb 2025 14:55:29 -0800
 Subject: [PATCH 07/11] anv: Mark images with format modifiers set as scanout.
@@ -439,7 +439,7 @@ index 0fb86e9d846..de37994d324 100644
 2.49.0
 
 
-From 395b58b678a438bf04c96297f243eaebfb2b02ab Mon Sep 17 00:00:00 2001
+From 8c17b9dd7ad7f565080bd3623cfb820efb729444 Mon Sep 17 00:00:00 2001
 From: Antheas Kapenekakis <git@antheas.dev>
 Date: Mon, 24 Mar 2025 19:50:51 +0100
 Subject: [PATCH 08/11] Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM
@@ -472,7 +472,7 @@ index dfefc468bca..cc0719a1898 100644
 2.49.0
 
 
-From d4e93fa407acb088fb1b16f7cf79e24e9886cebd Mon Sep 17 00:00:00 2001
+From 816dec380bba16f65d7c65ddf9960a0ff79a8923 Mon Sep 17 00:00:00 2001
 From: Kyle Gospodnetich <me@kylegospodneti.ch>
 Date: Sun, 18 May 2025 09:40:01 -0700
 Subject: [PATCH 09/11] [BEGIN] Proton-GE Patches
@@ -481,7 +481,7 @@ Subject: [PATCH 09/11] [BEGIN] Proton-GE Patches
 2.49.0
 
 
-From d2797aae04d682bf180c919f35447e58f41c9157 Mon Sep 17 00:00:00 2001
+From e768b0cf066c73e9c379d59d380462c15f050a03 Mon Sep 17 00:00:00 2001
 From: Kyle Gospodnetich <me@kylegospodneti.ch>
 Date: Sun, 18 May 2025 09:42:23 -0700
 Subject: [PATCH 10/11] radv: min image count patch for Wine Wayland/Path of
@@ -506,7 +506,7 @@ Subject: [PATCH 10/11] radv: min image count patch for Wine Wayland/Path of
  15 files changed, 42 insertions(+), 22 deletions(-)
 
 diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
-index 15a3f710502..a6af9d67db0 100644
+index d03b311fa07..910d3989451 100644
 --- a/src/amd/vulkan/radv_instance.c
 +++ b/src/amd/vulkan/radv_instance.c
 @@ -148,7 +148,7 @@ static const struct debug_control trace_options[] = {
@@ -597,10 +597,10 @@ index f6cbe8de4b7..7d3e3c71acf 100644
        DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false)
        DRI_CONF_VK_KHR_PRESENT_WAIT(false)
 diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
-index 3475dda8083..c06297e9c07 100644
+index 5f6034061c2..ca7511877ee 100644
 --- a/src/util/00-mesa-defaults.conf
 +++ b/src/util/00-mesa-defaults.conf
-@@ -620,24 +620,24 @@ TODO: document the other workarounds.
+@@ -625,24 +625,24 @@ TODO: document the other workarounds.
  
          <application name="gfxbench" executable="testfw_app">
              <option name="mesa_glthread_app_profile" value="0" />
@@ -629,7 +629,7 @@ index 3475dda8083..c06297e9c07 100644
              <option name="vk_x11_strict_image_count" value="true" />
          </application>
  
-@@ -698,10 +698,12 @@ TODO: document the other workarounds.
+@@ -703,10 +703,12 @@ TODO: document the other workarounds.
  
          <application name="Path of Exile" executable="PathOfExile_x64Steam.exe">
              <option name="vk_zero_vram" value="true" />
@@ -643,7 +643,7 @@ index 3475dda8083..c06297e9c07 100644
  
          <application name="X4 Foundations" executable="X4">
 diff --git a/src/util/driconf.h b/src/util/driconf.h
-index 52605a44280..fc116c8d2bc 100644
+index 86e00d6edd6..a00c4c0e9a5 100644
 --- a/src/util/driconf.h
 +++ b/src/util/driconf.h
 @@ -448,8 +448,8 @@
@@ -672,7 +672,7 @@ index a843b463e84..4de75ceb8af 100644
        DRI_CONF_VK_XWAYLAND_WAIT_READY(true)
        DRI_CONF_VENUS_IMPLICIT_FENCING(false)
 diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c
-index 05a247181cf..b0fb88bf2d6 100644
+index 528605856d5..d0ffd475b8f 100644
 --- a/src/vulkan/wsi/wsi_common.c
 +++ b/src/vulkan/wsi/wsi_common.c
 @@ -219,7 +219,7 @@ wsi_device_init(struct wsi_device *wsi,
@@ -802,7 +802,7 @@ index 65b7fdf7212..ea5d3750f46 100644
 2.49.0
 
 
-From a5460180b4a9020aaad7078da88c306acb8ec970 Mon Sep 17 00:00:00 2001
+From a1be005decba7afccc3f9ef36d7b8913d3e53952 Mon Sep 17 00:00:00 2001
 From: Kyle Gospodnetich <me@kylegospodneti.ch>
 Date: Sun, 18 May 2025 09:59:41 -0700
 Subject: [PATCH 11/11] vulkan/wsi/wayland: Move drm syncobj to swapchain
diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec
index 1775c4fe20..ac6fe03053 100644
--- a/anda/lib/mesa/mesa.spec
+++ b/anda/lib/mesa/mesa.spec
@@ -29,11 +29,13 @@
 
 %ifarch %{ix86} x86_64
 %global with_crocus 1
-%global with_i915   1
 %global with_iris   1
 %global with_xa     1
 %global with_intel_clc 1
 %global intel_platform_vulkan %{?with_vulkan_hw:,intel,intel_hasvk}%{!?with_vulkan_hw:%{nil}}
+%if !0%{?rhel}
+%global with_i915   1
+%endif 
 %endif
 %ifarch x86_64
 %if !0%{?with_vulkan_hw}
@@ -42,17 +44,18 @@
 %endif
 
 %ifarch aarch64 x86_64 %{ix86}
-%global with_kmsro     1
 %if !0%{?rhel}
-%global with_lima      1
-%global with_vc4       1
-%global with_etnaviv   1
-%global with_tegra     1
 %global with_asahi     1
+%global with_d3d12     1
+%global with_etnaviv   1
+%global with_lima      1
+%global with_tegra     1
+%global with_vc4       1
+%global with_v3d       1
 %endif
 %global with_freedreno 1
+%global with_kmsro     1
 %global with_panfrost  1
-%global with_v3d       1
 %global with_xa        1
 %if 0%{?with_asahi}
 %global asahi_platform_vulkan %{?with_vulkan_hw:,asahi}%{!?with_vulkan_hw:%{nil}}
@@ -63,6 +66,7 @@
 %if !0%{?rhel}
 %global with_libunwind 1
 %global with_lmsensors 1
+%global with_virtio    1
 %endif
 
 %ifarch %{valgrind_arches}
@@ -71,7 +75,7 @@
 %bcond_with valgrind
 %endif
 
-%global vulkan_drivers swrast,virtio%{?base_vulkan}%{?intel_platform_vulkan}%{?asahi_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}
+%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?asahi_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}%{?with_virtio:,virtio}
 
 Name:           %{srcname}
 Summary:        Mesa graphics libraries
@@ -80,7 +84,7 @@ Summary:        Mesa graphics libraries
 # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details.
 Epoch:          1
 Version:        25.1.4
-Release:        1%?dist
+Release:        2%?dist
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
 URL:            http://www.mesa3d.org
 
@@ -95,12 +99,6 @@ Patch10:        gnome-shell-glthread-disable.patch
 # https://github.com/bazzite-org/mesa
 Patch20:        bazzite.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++
@@ -194,6 +192,9 @@ BuildRequires:  glslang
 %if 0%{?with_vulkan_hw}
 BuildRequires:  pkgconfig(vulkan)
 %endif
+%if 0%{?with_d3d12}
+BuildRequires:  pkgconfig(DirectX-Headers) >= 1.614.1
+%endif 
 
 %description
 %{summary}.
@@ -254,6 +255,7 @@ Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel
 Recommends:     %{name}-va-drivers%{?_isa}
 %endif
 Obsoletes:      %{name}-libglapi < %{?epoch:%{epoch}:}25.0.0~rc2-1
+Provides:       %{name}-libglapi >= %{?epoch:%{epoch}:}25.0.0~rc2-1
 
 %description dri-drivers
 %{summary}.
@@ -399,7 +401,7 @@ export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/"
   -Dplatforms=x11,wayland \
   -Dosmesa=true \
 %if 0%{?with_hardware}
-  -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_asahi:,asahi}%{?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_asahi:,asahi}%{?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}%{?with_d3d12:,d3d12} \
 %else
   -Dgallium-drivers=llvmpipe,virgl \
 %endif
@@ -568,14 +570,19 @@ popd
 %endif
 %ifarch %{ix86} x86_64
 %{_libdir}/dri/crocus_dri.so
-%{_libdir}/dri/i915_dri.so
 %{_libdir}/dri/iris_dri.so
+%if 0%{?with_i915}
+%{_libdir}/dri/i915_dri.so
+%endif 
 %endif
 %ifarch aarch64 x86_64 %{ix86}
 %if 0%{?with_asahi}
 %{_libdir}/dri/apple_dri.so
 %{_libdir}/dri/asahi_dri.so
 %endif
+%if 0%{?with_d3d12}
+%{_libdir}/dri/d3d12_dri.so
+%endif 
 %{_libdir}/dri/ingenic-drm_dri.so
 %{_libdir}/dri/imx-drm_dri.so
 %{_libdir}/dri/imx-lcdif_dri.so
@@ -656,6 +663,9 @@ popd
 %if 0%{?with_radeonsi}
 %{_libdir}/dri/radeonsi_drv_video.so
 %endif
+%if 0%{?with_d3d12}
+%{_libdir}/dri/d3d12_drv_video.so
+%endif 
 %{_libdir}/dri/virtio_gpu_drv_video.so
 %endif
 
@@ -669,16 +679,21 @@ popd
 %if 0%{?with_radeonsi}
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
 %endif
+%if 0%{?with_d3d12}
+%{_libdir}/vdpau/libvdpau_d3d12.so.1*
+%endif 
 %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
 %endif
 
 %files vulkan-drivers
 %{_libdir}/libvulkan_lvp.so
 %{_datadir}/vulkan/icd.d/lvp_icd.*.json
-%{_libdir}/libvulkan_virtio.so
-%{_datadir}/vulkan/icd.d/virtio_icd.*.json
 %{_libdir}/libVkLayer_MESA_device_select.so
 %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
+%if 0%{?with_virtio}
+%{_libdir}/libvulkan_virtio.so
+%{_datadir}/vulkan/icd.d/virtio_icd.*.json
+%endif 
 %if 0%{?with_vulkan_hw}
 %{_libdir}/libvulkan_radeon.so
 %{_datadir}/drirc.d/00-radv-defaults.conf