Accepting request 1273728 from X11:XOrg

- Update to release 25.0.5 --> https://docs.mesa3d.org/relnotes/25.0.5 OBS-URL: https://build.opensuse.org/request/show/1273728 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=542
- Update to release 25.0.5
2025-05-01 13:22:43 +00:00 · 2025-04-30 18:13:26 +00:00 · 2025-04-20 07:34:36 +00:00 · 2025-04-18 17:25:04 +00:00 · 2025-04-09 19:49:23 +00:00 · 2025-04-07 19:22:39 +00:00
33 changed files with 1073 additions and 174 deletions
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,439 @@
+-------------------------------------------------------------------
+Wed Apr 30 17:53:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 25.0.5
+  --> https://docs.mesa3d.org/relnotes/25.0.5
+
+-------------------------------------------------------------------
+Fri Apr 18 17:14:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 25.0.4
+  --> https://docs.mesa3d.org/relnotes/25.0.4
+
+-------------------------------------------------------------------
+Mon Apr  7 19:20:37 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- let Mesa-dri only require libvulkan1, libvulkan_lvp if build
+  of vulkan drivers is enabled on this platform
+
+-------------------------------------------------------------------
+Mon Apr  7 14:37:45 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- let Mesa-dri also require libvulkan_lvp; fixes startup of Wayland
+  sessions with Mesa 25.0.3 (boo#1240854)
+
+-------------------------------------------------------------------
+Mon Apr  7 09:54:36 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_clover-Don-t-include-libclc-headers.patch
+  * don't break clover with libclc 20.1.0 update (boo#1240848)
+
+-------------------------------------------------------------------
+Sun Apr  6 09:24:16 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 25.0.3
+  --> https://docs.mesa3d.org/relnotes/25.0.3
+
+-------------------------------------------------------------------
+Fri Apr  4 12:23:19 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- require llvm20/clang20 
+
+-------------------------------------------------------------------
+Mon Mar 31 16:20:27 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- don't apply revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
+  on s390x, which is not affected by that issue (different Mesa
+  version) 
+
+-------------------------------------------------------------------
+Tue Mar 25 09:07:24 UTC 2025 - Wolfgang Frisch <wolfgang.frisch@suse.com>
+
+- Fix regression in winsys/amdgpu (boo#1239657)
+  revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
+  https://gitlab.freedesktop.org/mesa/mesa/-/issues/12809
+  https://gitlab.freedesktop.org/mesa/mesa/-/commit/8c91624614c1f939974fe0d2d1a3baf83335cecb
+
+-------------------------------------------------------------------
+Thu Mar 20 15:10:52 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 25.0.2
+   --> https://docs.mesa3d.org/relnotes/25.0.2
+
+-------------------------------------------------------------------
+Sun Mar  9 11:06:22 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Make build recipe POSIX sh compatible
+
+-------------------------------------------------------------------
+Fri Mar  7 13:40:43 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- enabled Raytracing (vulkan) support for intel ARC GPUs
+  (boo#1238732)
+
+-------------------------------------------------------------------
+Fri Mar  7 09:56:50 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer hardcode CXX, but instead make use of %gcc_version, 
+  which is implicitely set in prjconf, which I wasn't aware of ...
+
+-------------------------------------------------------------------
+Thu Mar  6 22:21:45 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- CXX needs to be set to an existing g++ compiler; otherwise you get
+    meson.build:4:0: ERROR: Unknown compiler(s): [['c++'], ['g++'], ['clang++'], ['nvc++'], ['pgc++'], ['icpc'], ['icpx']]
+    The following exception(s) were encountered:
+    Running `c++ --version` gave "[Errno 2] No such file or directory: 'c++'"
+    Running `g++ --version` gave "[Errno 2] No such file or directory: 'g++'"
+    Running `clang++ --version` gave "[Errno 2] No such file or directory: 'clang++'"
+    Running `nvc++ --version` gave "[Errno 2] No such file or directory: 'nvc++'"
+    Running `pgc++ --version` gave "[Errno 2] No such file or directory: 'pgc++'"
+    Running `icpc --version` gave "[Errno 2] No such file or directory: 'icpc'"
+    Running `icpx --version` gave "[Errno 2] No such file or directory: 'icpx'"
+  Since there is no 'g++' available I take 'g++-14', i.e. 
+   export CXX=g++-14
+  I don't care if gcc gets updated and Mesa fails then. I much more
+  often need to update Mesa than we see a gcc update ...
+
+-------------------------------------------------------------------
+Thu Mar  6 14:58:51 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- fixed build for TW
+
+-------------------------------------------------------------------
+Thu Mar  6 13:51:52 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Build with GCC 13 on Leap/SLES 15 (bsc#1238713)
+
+-------------------------------------------------------------------
+Wed Mar  5 22:13:36 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 25.0.1
+   --> https://docs.mesa3d.org/relnotes/25.0.1
+
+-------------------------------------------------------------------
+Wed Mar  5 13:16:20 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- don't obsolete Mesa-libglapi0 on s390x since this is still on 
+  Mesa 24.1.7 
+
+-------------------------------------------------------------------
+Fri Feb 21 14:04:21 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Add explanation for the "CM" in "GLESv1_CM".
+- Drop idempotent %if..%endif guards that do nothing.
+- Combine some rm calls in the build recipe.
+- Add -v argument to all rm calls to see the result of the
+  deletion in the build log.
+
+-------------------------------------------------------------------
+Thu Feb 20 12:58:48 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 25.0.0
+   --> https://docs.mesa3d.org/relnotes/25.0.0 
+- adjusted u_dep_xcb.patch
+- supersedes U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch
+- libglapi merged into libgallium
+- add patches to fix compilation with Python 3.6 (SLE15 SP7, SLE16, Leap 15.6)
+  * u_intel-drop-annotations-from-spv2hex.patch
+  * u_meson-lower-python-version-requirement.patch
+  --> credits go to "Mikhail Paulyshka" <me@mixaill.net>
+
+-------------------------------------------------------------------
+Fri Jan 31 23:39:37 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_radeonsi-disallow-compute-queues-on-Raven-Raven2-due.patch 
+  * Fixes: 58b512ddd6e - radeonsi: execute clears at resource 
+    allocation using compute instead of gfx
+  * Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310
+
+-------------------------------------------------------------------
+Wed Jan 22 22:10:01 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 24.3.4
+  --> https://docs.mesa3d.org/relnotes/24.3.4
+
+-------------------------------------------------------------------
+Sun Jan 12 20:38:28 UTC 2025 - Mikhail Paulyshka <me@mixaill.net>
+
+- aarch64: enable build of panvk driver
+
+-------------------------------------------------------------------
+Sat Jan  4 20:46:28 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 24.3.3
+  --> https://docs.mesa3d.org/relnotes/24.3.3
+
+-------------------------------------------------------------------
+Sat Jan  4 20:08:17 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 24.3.2
+  --> https://docs.mesa3d.org/relnotes/24.3.2
+- supersedes the following patches:
+  * 0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch
+  * 0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch
+  * 0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch
+
+-------------------------------------------------------------------
+Thu Dec 12 19:59:52 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- require llvm19/clang19 on sle15 >= sp6
+
+-------------------------------------------------------------------
+Mon Dec  9 19:04:25 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- aarch64: disable build of etnaviv driver on sle15-sp7 due to
+  python3-pycparser >= 2.20 not available
+
+-------------------------------------------------------------------
+Mon Dec  9 14:36:46 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- don't apply patches of previous changelog for s390x; Mesa 24.1.7
+  doesn't suffer from this issue, only Mesa 24.3.1 ... 
+
+-------------------------------------------------------------------
+Sun Dec  8 21:58:37 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- 0001-dri-don-t-fetch-X11-modifiers-if-we-don-t-support-th.patch
+  0002-egl-wayland-only-supply-LINEAR-modifier-when-support.patch
+  0003-egl-wayland-fallback-to-implicit-modifiers-if-advert.patch
+  * fixes mesa 24.3.1 gallium crash/segfault on GPUs without
+    format modifiers (mesa issue#12253, mesa MR#32535, boo#1234302)
+
+-------------------------------------------------------------------
+Thu Dec  5 03:00:23 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 24.3.1
+  --> https://docs.mesa3d.org/relnotes/24.3.1
+
+-------------------------------------------------------------------
+Wed Nov 27 23:10:50 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- trying to make buildservice happy by adding both tarballs to
+  specfile ... 
+
+-------------------------------------------------------------------
+Tue Nov 26 18:20:06 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- on s390x build Mesa 24.1.7 to fix colors with Xvnc (boo#1233167)
+- adjusted patches for Mesa 24.1.7:
+  * python36-buildfix1-s390x.patch
+  * u_dep_xcb-s390x.patch
+  * u_mesa-CVE-2023-45913-s390x.patch
+
+-------------------------------------------------------------------
+Fri Nov 22 10:35:29 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.3.0
+  --> https://docs.mesa3d.org/relnotes/24.3.0
+
+-------------------------------------------------------------------
+Thu Nov 21 05:09:35 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.3.0~rc2
+  --> https://www.phoronix.com/news/Mesa-24.3-rc2
+- Update to release 24.3.0~rc1
+  --> https://www.phoronix.com/news/Mesa-24.3-rc1-Released
+- refreshed patches:
+  * n_drirc-disable-rgb10-for-chromium-on-amd.patch
+  * python36-buildfix1.patch
+  * python36-buildfix2.patch
+  * tlsdesc_test.patch
+  * u_mesa-CVE-2023-45913.patch
+  * u_mesa-CVE-2023-45919.patch
+  * u_mesa-CVE-2023-45922.patch
+  * u_dep_xcb.patch
+- drop no longer supported options:
+  * -Ddri3=enabled
+  * -Ddri-search-path=%{_libdir}/dri
+- new files added in this update currently packaged as part of
+  Mesa-dri:
+  * %{_libdir}/gbm/dri_gbm.so
+
+-------------------------------------------------------------------
+Tue Nov 19 12:48:59 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to release 24.2.7
+  --> https://docs.mesa3d.org/relnotes/24.2.7
+- supersedes 0001-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch
+
+-------------------------------------------------------------------
+Wed Nov  6 17:34:15 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- 0001-dril-Fixup-order-of-pixel-formats-in-drilConfigs.patch
+  * fixes colors for 'swrast' driver (boo#1230637, gitlab issue#11840)
+
+-------------------------------------------------------------------
+Thu Oct 31 19:35:20 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.6
+  --> https://docs.mesa3d.org/relnotes/24.2.6
+
+-------------------------------------------------------------------
+Thu Oct 31 19:15:10 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- added -32bit package for Mesa-libva since it's needed by Steam;
+  reported on packman ML:
+  https://lists.links2linux.de/pipermail/packman/2024-October/017985.html 
+
+-------------------------------------------------------------------
+Fri Oct 18 11:00:17 UTC 2024 - Andreas Färber <afaerber@suse.de>
+
+- Enable intel Vulkan backends on riscv64 (boo#1231756)
+- Enable iris Gallium backend on riscv64, Power and on Arm, too
+
+-------------------------------------------------------------------
+Thu Oct 17 10:16:01 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.5
+  --> https://docs.mesa3d.org/relnotes/24.2.5
+- drop u_fix-llvm19-build.patch
+  included in upstream
+
+-------------------------------------------------------------------
+Thu Oct  3 19:00:29 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.4
+  --> https://docs.mesa3d.org/relnotes/24.2.4
+
+-------------------------------------------------------------------
+Tue Oct  1 11:08:36 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- u_mesa-CVE-2023-45913.patch
+  * NULL pointer dereference via dri2GetGlxDrawableFromXDrawableId()
+    (CVE-2023-45913, bsc#1222040)
+- u_mesa-CVE-2023-45919.patch
+  * buffer over-read in glXQueryServerString() 
+    (CVE-2023-45919, bsc#1222041)
+- u_mesa-CVE-2023-45922.patch
+  * segmentation violation in __glXGetDrawableAttribute()
+    (CVE-2023-45922, bsc#1222042) 
+
+-------------------------------------------------------------------
+Mon Sep 23 16:56:40 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- libvdpau_gallium was linked directly into libgallium-*.so.*.
+  Drop the subpackage and provides/obsolete it via Mesa-dri which
+  ships libgallium-*.so.*.
+
+-------------------------------------------------------------------
+Mon Sep 23 16:37:33 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- drop u_fix_rust_bindgen.patch 
+  included in update
+
+-------------------------------------------------------------------
+Mon Sep 23 16:32:05 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.3
+  --> https://docs.mesa3d.org/relnotes/24.2.3
+
+-------------------------------------------------------------------
+Mon Sep 23 10:58:19 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- disable build of rusticl on sle15; meson is just too old ... 
+
+-------------------------------------------------------------------
+Mon Sep 23 10:51:31 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- buildrequires: rusticl needs mesa >= 1.4.0
+
+-------------------------------------------------------------------
+Mon Sep 23 10:40:35 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- tlsdesc_test.patch: disable LTO in tlsdesc_test to suppress TLS
+  relaxation (patch by Andreas Schwab <schwab@suse.de>); see also
+  https://gitlab.freedesktop.org/mesa/mesa/-/issues/11929
+
+-------------------------------------------------------------------
+Mon Sep 23 10:36:35 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- buildrequire llvm19-devel/clang19-devel on sle15-sp7
+
+-------------------------------------------------------------------
+Sun Sep 22 12:02:17 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Add u_fix-llvm19-build.patch to fix build with LLVM 19 on ARM.
+- Update minimum version requirements based on meson.build.
+- Fix build on s390x: apparently we don't have libvdpau_gallium.so.
+
+-------------------------------------------------------------------
+Fri Sep 13 17:39:59 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- drop U_egl-x11-sw-fix-partial-image-uploads.patch:
+  the code in the function saw further fixes later on in the 24.2
+  branch.
+
+-------------------------------------------------------------------
+Fri Sep 13 15:42:12 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_egl-x11-sw-fix-partial-image-uploads.patch
+  * culprit for the regression in 24.1.4; reverse apply this for
+    now (boo#1228164)
+
+-------------------------------------------------------------------
+Tue Sep 10 14:35:00 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- integrated changes by Andreas Schwab <schwab@suse.de>
+  * enable glamor also for driver build
+  * update rust crates
+    + syn 2.0.39
+    + proc_macro2 1.0.86
+  * enable valgrind also on riscv64
+  * added libvdpau_gallium package for generic VDPAU state tracker
+  * switch from "swrast" to "softpipe,llvmpipe" drivers
+  * use "-Dllvm-orcjit=true" for riscv64 build
+  * added libgallium to Mesa-dri package
+
+-------------------------------------------------------------------
+Tue Sep 10 13:38:59 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- re-disable llvm for non-driver build by switching from "swrast"
+  to "softpipe" for gallium drivers in that case
+- make previous changelog a bit nicer
+
+-------------------------------------------------------------------
+Sun Sep  8 17:39:10 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.2
+  --> https://docs.mesa3d.org/relnotes/24.2.2
+  --> https://docs.mesa3d.org/relnotes/24.2.1
+  --> https://docs.mesa3d.org/relnotes/24.2.0
+
+- refreshed the following patches with quilt:
+  * U_fix-mpeg1_2-decode-mesa-20.2.patch
+  * n_add-Mesa-headers-again.patch
+  * n_stop-iris-flicker.patch
+  * u_dep_xcb.patch
+  * u_fix_rust_bindgen.patch
+- dropped U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch
+- New BuildRequires:
+  * python3-PyYAML
+- enable llvm also for non-driver build to fix:
+  "llvmpipe requires LLVM and is enabled, but LLVM is disabled".
+
+-------------------------------------------------------------------
+Thu Sep  5 19:20:59 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to bugfix release 24.1.7
+  --> https://docs.mesa3d.org/relnotes/24.1.7
+- Supersedes the following patch:
+  * U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch
+- Rebase patches with quilt.
+
+-------------------------------------------------------------------
+Sun Aug 25 09:04:57 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Fix random GPU crash with AMDGPU (bsc#1229050):
+  U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch
+  (credits go to Takashi Iwai!)
+
+-------------------------------------------------------------------
+Wed Aug 21 16:53:28 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fix build with current rust-bindgen
+  * u_fix_rust_bindgen.patch
+
 -------------------------------------------------------------------
 Thu Jul  4 12:26:06 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Mesa
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,11 @@

 %define glamor 1
 %define _name_archive mesa
-%define _version 24.1.3
+%ifnarch s390x
+%define _version 25.0.5
+%else
+%define _version 24.1.7
+%endif
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -85,14 +89,14 @@
  %ifarch %{arm} aarch64
    %define with_vulkan 1
    %if 0%{?suse_version} > 1600
-    %define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk,nouveau
+    %define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk,nouveau,panfrost
    %else
    %define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk
    %endif
  %endif
  %ifarch riscv64
    %define with_vulkan 1
-    %define vulkan_drivers swrast,amd
+    %define vulkan_drivers swrast,amd,intel,intel_hasvk
  %endif
 %endif

@@ -107,8 +111,8 @@
 %endif

 %if "%{flavor}" == "drivers"
-  %define glamor 0
-%if ((0%{?suse_version} >= 1550) || (0%{?sle_version} >= 150600))  && 0%{with_opencl}
+  %define glamor 1
+%if 0%{?suse_version} >= 1550 && 0%{with_opencl}
  %define with_rusticl 1
 %endif
 %else
@@ -139,13 +143,23 @@

 # NVK aka Vulkan Nouveau dependencies
 %global _unicode_ident_crate_ver 1.0.12
-%global _syn_crate_ver 2.0.39
+%global _syn_crate_ver 2.0.68
 %global _quote_crate_ver 1.0.33
-%global _proc_macro2_ver 1.0.70
+%global _proc_macro2_ver 1.0.86
 %global _paste_crate_ver 1.0.14

+# Leap 15 and SLES 15 defaults to GCC 7, which does not have stable C++17 ABI.
+# See https://bugzilla.suse.com/show_bug.cgi?id=1235697
+%if 0%{?gcc_version} < 13
+%define gcc_version 13
+%endif
+
 Name:           Mesa%{psuffix}
-Version:        24.1.3
+%ifnarch s390x
+Version:        25.0.5
+%else
+Version:        24.1.7
+%endif
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -173,33 +187,63 @@ Source9:        manual-pages.tar.bz2
 Source10:       Mesa-rpmlintrc
 Source11:       Mesa.keyring
 Source12:       README-suse-maintenance.md
+Source20:       https://archive.mesa3d.org/%{_name_archive}-25.0.5.tar.xz
+Source21:       https://archive.mesa3d.org/%{_name_archive}-25.0.5.tar.xz.sig
 Patch2:         n_add-Mesa-headers-again.patch
 Patch11:        u_0001-intel-genxml-Drop-from-__future__-import-annotations.patch
 Patch12:        u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch
+%ifnarch s390x
 Patch13:        python36-buildfix1.patch
+%else
+Patch13:        python36-buildfix1-s390x.patch
+%endif
 Patch14:        python36-buildfix2.patch
+Patch17:        tlsdesc_test.patch
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
-Patch58:        u_dep_xcb.patch
 Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch400:       n_stop-iris-flicker.patch
+%ifnarch s390x
+Patch500:       u_dep_xcb.patch
+%else
+Patch500:       u_dep_xcb-s390x.patch
+%endif
+%ifnarch s390x
+Patch700:       u_meson-lower-python-version-requirement.patch
+Patch701:       u_intel-drop-annotations-from-spv2hex.patch
+Patch702:       U_clover-Don-t-include-libclc-headers.patch
+%endif
+%ifnarch s390x
+Patch1222040:   u_mesa-CVE-2023-45913.patch
+%else
+Patch1222040:   u_mesa-CVE-2023-45913-s390x.patch
+%endif
+Patch1222041:   u_mesa-CVE-2023-45919.patch
+Patch1222042:   u_mesa-CVE-2023-45922.patch
+
+# Reverts a possible regression
+# https://gitlab.freedesktop.org/mesa/mesa/-/commit/8c91624614c1f939974fe0d2d1a3baf83335cecb
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1239657
+Patch2000000:   revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
+
 %ifarch %{ix86} x86_64
-BuildRequires:  DirectX-Headers
+BuildRequires:  DirectX-Headers >= 1.613.0
 %endif
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  flex
-%if 0%{?sle_version} >= 150400
-BuildRequires:  gcc13-c++
-%else
-BuildRequires:  gcc-c++
-%endif
+BuildRequires:  gcc%{?gcc_version} >= 9
+BuildRequires:  gcc%{?gcc_version}-c++ >= 9
 BuildRequires:  glslang-devel
 BuildRequires:  imake
 BuildRequires:  libtool
 BuildRequires:  memory-constraints
-BuildRequires:  meson >= 0.60
+%if 0%{with_rusticl}
+BuildRequires:  meson >= 1.4.0
+%else
+BuildRequires:  meson >= 1.1.0
+%endif
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
 # dataclasses is in standard library of python >= 3.7
@@ -207,23 +251,24 @@ BuildRequires:  python3-base
 BuildRequires:  python3-dataclasses
 %endif
 BuildRequires:  python3-Mako
+BuildRequires:  python3-PyYAML
 BuildRequires:  python3-xml
 BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(dri3proto)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(glproto)
-BuildRequires:  pkgconfig(libdrm) >= 2.4.75
-BuildRequires:  pkgconfig(libdrm_amdgpu) >= 2.4.95
+BuildRequires:  pkgconfig(libdrm) >= 2.4.109
+BuildRequires:  pkgconfig(libdrm_amdgpu) >= 2.4.121
 BuildRequires:  pkgconfig(libdrm_nouveau) >= 2.4.66
 BuildRequires:  pkgconfig(libdrm_radeon) >= 2.4.71
-BuildRequires:  pkgconfig(libglvnd) >= 0.1.0
-%ifarch aarch64 x86_64 ppc64le s390x
+BuildRequires:  pkgconfig(libglvnd) >= 1.3.2
+%ifarch aarch64 x86_64 ppc64le s390x riscv64
 BuildRequires:  pkgconfig(valgrind)
 %endif
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(presentproto)
 %if "%{flavor}" == "drivers"
-BuildRequires:  pkgconfig(vdpau) >= 1.1
+BuildRequires:  pkgconfig(vdpau) >= 1.5
 %ifarch %{ix86} x86_64
 BuildRequires:  pkgconfig(vulkan)
 %endif
@@ -260,12 +305,14 @@ Obsoletes:      libXvMC_r600 < %{version}
 Provides:       libtxc_dxtn = %{version}
 Obsoletes:      libtxc_dxtn < %{version}
 %ifarch %{arm} aarch64
+%if 0%{?suse_version} >= 1550
 BuildRequires:  python3-pycparser >= 2.20
 BuildRequires:  pkgconfig(libdrm_etnaviv) >= 2.4.89
+%endif
 BuildRequires:  pkgconfig(libdrm_freedreno) >= 2.4.74
 BuildRequires:  pkgconfig(libelf)
 %endif
-%ifarch x86_64 %{ix86} aarch64 %{arm}
+%ifarch x86_64 %{ix86} aarch64 %{arm} riscv64
 BuildRequires:  libelf-devel
 BuildRequires:  pkgconfig(libdrm_intel) >= 2.4.75
 %else
@@ -281,8 +328,8 @@ BuildRequires:  pkgconfig(wayland-server) >= 1.11
 %if 0%{?suse_version} >= 1550
 BuildRequires:  llvm-devel
 %else
-%if 0%{?sle_version} >= 150500
-BuildRequires:  llvm18-devel
+%if 0%{?sle_version} >= 150600
+BuildRequires:  llvm20-devel
 %endif
 %endif
 %endif
@@ -291,8 +338,8 @@ BuildRequires:  llvm18-devel
 %if 0%{?suse_version} >= 1550
 BuildRequires:  clang-devel
 %else
-%if 0%{?sle_version} >= 150500
-BuildRequires:  clang18-devel
+%if 0%{?sle_version} >= 150600
+BuildRequires:  clang20-devel
 %endif
 %endif
 BuildRequires:  libclc
@@ -346,7 +393,9 @@ Requires:       Mesa-libEGL-devel = %{version}
 Requires:       Mesa-libGL-devel = %{version}
 Requires:       Mesa-libGLESv1_CM-devel = %{version}
 Requires:       Mesa-libGLESv2-devel = %{version}
+%ifarch s390x
 Requires:       Mesa-libglapi-devel = %{version}
+%endif
 Requires:       libOSMesa-devel = %{version}
 Requires:       libgbm-devel = %{version}
 Provides:       Mesa-devel-static = %{version}
@@ -453,7 +502,7 @@ This package includes headers and static libraries for compiling
 programs with Mesa.

 %package libGLESv1_CM-devel
-Summary:        Development files for the OpenGL ES 1.x API
+Summary:        Development files for the OpenGL ES 1.x Common Profile API
 Group:          Development/Libraries/C and C++
 Requires:       Mesa-KHR-devel = %{version}
 Requires:       libglvnd-devel >= 0.1.0
@@ -468,7 +517,7 @@ extensions for the special needs of embedded systems.
 OpenGL|ES 1.x provides an API for fixed-function hardware.

 This package provides a development environment for building programs
-using the OpenGL|ES 1.x APIs.
+using the OpenGL|ES 1.x Common Profile APIs.

 %package libGLESv2-devel
 Summary:        Development files for the OpenGL ES 2.x API
@@ -516,16 +565,6 @@ OSmesa is a Mesa extension that allows programs to render to an
 off-screen buffer using the OpenGL API without having to create a
 rendering context on an X Server. It uses a pure software renderer.

-%package -n libOSMesa-devel
-Summary:        Development files for the Mesa Offscreen Rendering extension
-Group:          Development/Libraries/C and C++
-Requires:       libOSMesa8 = %{version}
-
-%description -n libOSMesa-devel
-Development files for the OSmesa Mesa extension that allows programs to render to an
-off-screen buffer using the OpenGL API without having to create a
-rendering context on an X Server. It uses a pure software renderer.
-
 %package libglapi0
 Summary:        Free implementation of the GL API
 Group:          System/Libraries
@@ -545,12 +584,32 @@ Development files for the Mesa GL API module which is responsible for
 dispatching all the gl* functions. It is intended to be mainly used by
 the Mesa-libGLES* packages.

+%package -n libOSMesa-devel
+Summary:        Development files for the Mesa Offscreen Rendering extension
+Group:          Development/Libraries/C and C++
+Requires:       libOSMesa8 = %{version}
+
+%description -n libOSMesa-devel
+Development files for the OSmesa Mesa extension that allows programs to render to an
+off-screen buffer using the OpenGL API without having to create a
+rendering context on an X Server. It uses a pure software renderer.
+
 %package -n Mesa-dri
 Summary:        DRI plug-ins for 3D acceleration
 Group:          System/Libraries
 Requires:       Mesa = %{version}
+%if 0%{with_vulkan}
 Requires:       libvulkan1
+Requires:       libvulkan_lvp
+%endif
 Supplements:    Mesa
+# merged into libgallium in 24.2.3
+Provides:       libvdpau_gallium = %{version}-%{release}
+Obsoletes:      libvdpau_gallium < %{version}-%{release}
+# merged into libgallium in 25.0.0
+%ifnarch s390x
+Obsoletes:      Mesa-libglapi0 < 25.0.0
+%endif

 %description -n Mesa-dri
 This package contains Mesa DRI drivers for 3D acceleration.
@@ -767,6 +826,13 @@ Group:          System/Libraries

 %description -n libvulkan_freedreno
 This package contains the Vulkan parts for Mesa.
+
+%package -n libvulkan_panfrost
+Summary:        Mesa vulkan driver for ARM Mali
+Group:          System/Libraries
+
+%description -n libvulkan_panfrost
+This package contains the Vulkan parts for Mesa.
 %endif

 %package -n Mesa-vulkan-device-select
@@ -830,14 +896,25 @@ cp %{SOURCE6} subprojects/packagecache/
 %if 0%{?suse_version} < 1550
 %patch -P 14 -p1
 %endif
+%patch -P 17 -p1
 # no longer needed since gstreamer-plugins-vaapi 1.18.4
 %if 0%{?suse_version} < 1550
 %patch -P 54 -p1
 %endif
-%patch -P 58 -p1
 %patch -P 100 -p1
 %patch -P 400 -p1
-
+%patch -P 500 -p1
+%ifnarch s390x
+%patch -P 700 -p1
+%patch -P 701 -p1
+%patch -P 702 -p1
+%endif
+%patch -P 1222040 -p1
+%patch -P 1222041 -p1
+%patch -P 1222042 -p1
+%ifnarch s390x
+%patch -P 2000000 -p1
+%endif
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...
 %if 0%{?with_vulkan} == 0
@@ -850,10 +927,8 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
 %ifarch ppc64 ppc64le
 %limit_build -m 1024
 %endif
-%if 0%{?sle_version} >= 150400
-export CC=gcc-13
-export CXX=g++-13
-%endif
+export CC=gcc-%{gcc_version}
+export CXX=g++-%{gcc_version}

 egl_platforms=x11,wayland

@@ -879,13 +954,12 @@ egl_platforms=x11,wayland
            -Dvulkan-drivers= \
 %endif
            -Dxlib-lease=enabled \
-            -Dglvnd=true \
+            -Dglvnd=enabled \
            -Dgles1=enabled \
            -Dgles2=enabled \
            -Degl=enabled \
            -Dallow-kcmp=enabled \
            -Dplatforms=$egl_platforms \
-            -Ddri3=enabled \
            -Dshared-glapi=enabled \
 %if 0%{?with_nine}
            -Dgallium-nine=true \
@@ -903,7 +977,6 @@ egl_platforms=x11,wayland
            -Drust_std=2021 \
 %endif
 %endif
-            -Ddri-search-path=%{_libdir}/dri \
 %if 0%{with_llvm}
            -Dllvm=enabled \
            -Dshared-llvm=enabled \
@@ -925,24 +998,36 @@ egl_platforms=x11,wayland
            -Dvulkan-drivers= \
 %endif
  %ifarch %{ix86} x86_64
-            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915,d3d12,zink \
+            -Dgallium-drivers=r300,r600,radeonsi,nouveau,softpipe,llvmpipe,svga,virgl,iris,crocus,i915,d3d12,zink \
            -Dgallium-d3d12-video=enabled \
            -Dgallium-d3d12-graphics=enabled \
+            -Dintel-rt=enabled \
  %else
  %ifarch %{arm} aarch64
-            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,v3d,svga,tegra,zink \
+%if 0%{?suse_version} >= 1550
+            -Dgallium-drivers=r300,r600,radeonsi,nouveau,softpipe,llvmpipe,virgl,iris,freedreno,vc4,etnaviv,lima,panfrost,v3d,svga,tegra,zink \
+%else
+            -Dgallium-drivers=r300,r600,radeonsi,nouveau,softpipe,llvmpipe,virgl,iris,freedreno,vc4,lima,panfrost,v3d,svga,tegra,zink \
+%endif
  %else
  %ifarch ppc64 ppc64le riscv64
-            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl,zink \
+            -Dgallium-drivers=r300,r600,radeonsi,nouveau,softpipe,llvmpipe,virgl,iris,zink \
  %else
            -Dgallium-drivers=swrast \
  %endif
  %endif
  %endif
+%ifarch riscv64
+            -Dllvm-orcjit=true \
+%endif
+%else
+%ifnarch s390x
+            -Dgallium-drivers=softpipe \
 %else
            -Dgallium-drivers=swrast \
 %endif
-%ifarch aarch64 x86_64 ppc64le s390x
+%endif
+%ifarch aarch64 x86_64 ppc64le s390x riscv64
            -Dvalgrind=enabled \
 %endif
            -Db_ndebug=true \
@@ -961,75 +1046,82 @@ export MESON_PACKAGE_CACHE_DIR="%{_sourcedir}"
 find %{buildroot} -type f -name "*.la" -delete -print

 # libwayland-egl is provided by wayland itself
-rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
-rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
+rm -fv %{buildroot}/%{_libdir}/libwayland-egl.so* \
+	%{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc

 %if "%{flavor}" == "drivers"
 # Delete things that we do not package in the Mesa-drivers variant, but can
 # not disable from buildling and installing.

-rm -f %{buildroot}/%{_libdir}/libEGL.so*
+rm -fv %{buildroot}/%{_libdir}/libEGL.so*
 # in Mesa-libEGL-devel
-rm %{buildroot}/%{_includedir}/EGL/egl.h
-rm %{buildroot}/%{_includedir}/EGL/eglext.h
-rm %{buildroot}/%{_includedir}/EGL/eglext_angle.h
-rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h
-rm %{buildroot}/%{_includedir}/EGL/eglplatform.h
+rm -v %{buildroot}/%{_includedir}/EGL/egl.h \
+	%{buildroot}/%{_includedir}/EGL/eglext.h \
+	%{buildroot}/%{_includedir}/EGL/eglext_angle.h \
+	%{buildroot}/%{_includedir}/EGL/eglmesaext.h \
+	%{buildroot}/%{_includedir}/EGL/eglplatform.h

 # in Mesa-libGL-devel
-rm -rf %{buildroot}/%{_includedir}/GL
+rm -Rfv %{buildroot}/%{_includedir}/GL

 #in Mesa-libGLESv1_CM-devel
-rm -rf %{buildroot}/%{_includedir}/GLES
+rm -Rfv %{buildroot}/%{_includedir}/GLES

 #in Mesa-libGLESv2-devel
-rm -rf %{buildroot}/%{_includedir}/GLES2
+rm -Rfv %{buildroot}/%{_includedir}/GLES2

 #in Mesa-libGLESv3-devel
-rm -rf %{buildroot}/%{_includedir}/GLES3
+rm -Rfv %{buildroot}/%{_includedir}/GLES3

 #in Mesa-libEGL1
-rm -f %{buildroot}/%{_libdir}/libEGL_mesa.so*
-rm -rf %{buildroot}/%{_datadir}/glvnd
+rm -Rfv %{buildroot}/%{_libdir}/libEGL_mesa.so* \
+	%{buildroot}/%{_datadir}/glvnd

 # in Mesa-libglapi0
-rm %{buildroot}/%{_libdir}/libglapi.so*
+%ifarch s390x
+rm -v %{buildroot}/%{_libdir}/libglapi.so*
+%endif

 # in libwayland-egl1
-rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
-rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
+rm -fv %{buildroot}/%{_libdir}/libwayland-egl.so* \
+	%{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc

 # in Mesa-dri-devel
-rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc
+rm -v %{buildroot}/%{_libdir}/pkgconfig/dri.pc

 # in KHR-devel
-rm -rf %{buildroot}/%{_includedir}/KHR
+rm -Rfv %{buildroot}/%{_includedir}/KHR

-# workaround needed since Mesa 19.0.2
-rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so
+# in libgbm-devel
+rm -fv %{buildroot}%{_includedir}/gbm.h \
+	%{buildroot}%{_libdir}/libgbm.so* \
+	%{buildroot}%{_libdir}/pkgconfig/gbm.pc

 %else
 # package in Mesa-dri
-rm -rf %{buildroot}/%{_datadir}/drirc.d
+rm -Rfv %{buildroot}/%{_datadir}/drirc.d

-rm -f %{buildroot}/%{_libdir}/dri/*_dri.so
-
-rm -f %{buildroot}%{_libdir}/libGLES*
+rm -Rfv %{buildroot}/%{_libdir}/dri/*_dri.so \
+	%{buildroot}%{_libdir}/libgallium-*.so \
+	%{buildroot}%{_libdir}/gbm/ \
+	%{buildroot}%{_libdir}/libGLES*
 # glvnd needs a default provider for indirect rendering where it cannot
 # determine the vendor
-ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
+ln -sv %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0

 # pickup pkgconfig files from libglvnd build
-rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
-install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
-   %{buildroot}/%{_libdir}/pkgconfig/
+for i in gl egl glesv1_cm glesv2; do
+	rm -fv "%{buildroot}/%{_libdir}/pkgconfig/$i.pc"
+	install -vm 0644 "%{_docdir}/libglvnd/pkgconfig/$i.pc" \
+		%{buildroot}/%{_libdir}/pkgconfig/
+done

-for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
- pushd $dir
+for dir in GL/gl GL/glx; do
+ cd "../xc/doc/man/$dir"
   xmkmf -a
-   make %{?_smp_mflags} V=1
+   %make_build V=1
   make install.man DESTDIR=%{buildroot} MANPATH=%{_mandir} LIBMANSUFFIX=3gl
- popd
+ cd -
 done
 %endif

@@ -1040,37 +1132,14 @@ done
 echo "The \"Mesa\" package does not have the ability to render, but is supplemented by \"Mesa-dri\" and \"Mesa-gallium\" which contain the drivers for rendering" > docs/README.package.%{_arch}
 %endif

-%post   -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post   libEGL1 -p /sbin/ldconfig
-
-%postun libEGL1 -p /sbin/ldconfig
-
-%post   libGL1 -p /sbin/ldconfig
-
-%postun libGL1 -p /sbin/ldconfig
-
-%post   -n libOSMesa8 -p /sbin/ldconfig
-
-%postun -n libOSMesa8 -p /sbin/ldconfig
-
-%post   -n libgbm1 -p /sbin/ldconfig
-
-%postun -n libgbm1 -p /sbin/ldconfig
-
-%post   -n libxatracker2 -p /sbin/ldconfig
-
-%postun -n libxatracker2 -p /sbin/ldconfig
-
-%post   libglapi0 -p /sbin/ldconfig
-
-%postun libglapi0 -p /sbin/ldconfig
-
-%post -n Mesa-libd3d -p /sbin/ldconfig
-
-%postun -n Mesa-libd3d -p /sbin/ldconfig
+%ldconfig_scriptlets
+%ldconfig_scriptlets libEGL1
+%ldconfig_scriptlets libGL1
+%ldconfig_scriptlets -n libOSMesa8
+%ldconfig_scriptlets -n libgbm1
+%ldconfig_scriptlets -n libxatracker2
+%ldconfig_scriptlets libglapi0
+%ldconfig_scriptlets -n Mesa-libd3d

 %if "%{flavor}" != "drivers"
 %files
@@ -1139,6 +1208,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_includedir}/xa_*.h
 %{_libdir}/libxatracker.so
 %{_libdir}/pkgconfig/xatracker.pc
+
 %endif

 %if %{vdpau_nouveau}
@@ -1180,6 +1250,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %endif
 %endif

+%ifarch s390x
 %if "%{flavor}" != "drivers"
 %files libglapi0
 %{_libdir}/libglapi.so.0*
@@ -1187,6 +1258,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %files libglapi-devel
 %{_libdir}/libglapi.so
 %endif
+%endif

 %if "%{flavor}" == "drivers"
 %files -n Mesa-dri
@@ -1200,6 +1272,11 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %ifarch %{arm} aarch64
 %exclude %{_libdir}/dri/vc4_dri.so
 %endif
+%ifnarch s390x
+%{_libdir}/libgallium-%{_version}.so
+%dir %{_libdir}/gbm/
+%{_libdir}/gbm/dri_gbm.so
+%endif

 %if 0%{with_opencl}
 # only built with opencl
@@ -1279,7 +1356,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %endif

 %if 0%{with_vulkan}
-%ifarch %{ix86} x86_64 aarch64 %{arm}
+%ifarch %{ix86} x86_64 aarch64 %{arm} riscv64
 %files -n libvulkan_intel
 %dir %{_datadir}/vulkan
 %dir %{_datadir}/vulkan/icd.d
@@ -1324,6 +1401,12 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %dir %{_datadir}/vulkan
 %dir %{_datadir}/vulkan/icd.d
 %{_datadir}/vulkan/icd.d/freedreno_icd.*.json
+
+%files -n libvulkan_panfrost
+%{_libdir}/libvulkan_panfrost.so
+%dir %{_datadir}/vulkan
+%dir %{_datadir}/vulkan/icd.d
+%{_datadir}/vulkan/icd.d/panfrost_icd.*.json
 %endif

 %files -n Mesa-vulkan-device-select
--- a/U_clover-Don-t-include-libclc-headers.patch
+++ b/U_clover-Don-t-include-libclc-headers.patch
@@ -0,0 +1,144 @@
+From e4eb5e80c316c0af3fff310ca89e1175d81556c1 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Thu, 27 Feb 2025 15:44:27 +0100
+Subject: [PATCH] clover: Don't include libclc headers
+
+Per https://github.com/llvm/llvm-project/issues/119967 these
+headers are internal implementation details of libclc and were
+never supposed to be installed. They are not available anymore
+since LLVM 20. Instead opencl-c.h should be used.
+
+There already ise a code path for including opencl-c.h, so always
+use it.
+
+This didn't work for me out of the box, because the build system
+currently hardcodes the clang resource directory, which is incorrect
+for Fedora at least. Fix this by using GetResourcePath +
+CLANG_RESOURCE_DIR provided by clang instead. This is basically
+the same as what is done in clc_helper.c
+
+I've still retained the old behavior as a fallback just in case
+(e.g. if clang is linked statically?)
+
+Reviewed-by: Karol Herbst <kherbst@redhat.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33805>
+---
+ .../frontends/clover/llvm/invocation.cpp      | 53 +++++++++++++------
+ src/gallium/frontends/clover/meson.build      |  5 +-
+ 2 files changed, 39 insertions(+), 19 deletions(-)
+
+diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
+index 3cbb05baecf..ca030b404d7 100644
+--- a/src/gallium/frontends/clover/llvm/invocation.cpp
+++ b/src/gallium/frontends/clover/llvm/invocation.cpp
+@@ -24,6 +24,8 @@
+ // OTHER DEALINGS IN THE SOFTWARE.
+ //
+ 
+#include <dlfcn.h>
+
+ #include <llvm/IR/DiagnosticPrinter.h>
+ #include <llvm/IR/DiagnosticInfo.h>
+ #include <llvm/IR/LLVMContext.h>
+@@ -39,6 +41,8 @@
+ #include <clang/Frontend/TextDiagnosticBuffer.h>
+ #include <clang/Frontend/TextDiagnosticPrinter.h>
+ #include <clang/Basic/TargetInfo.h>
+#include <clang/Config/config.h>
+#include <clang/Driver/Driver.h>
+ 
+ #if LLVM_VERSION_MAJOR >= 20
+ #include <llvm/Support/VirtualFileSystem.h>
+@@ -323,6 +327,30 @@ namespace {
+       return c;
+    }
+ 
+   std::string getResourceDirectory() {
+      Dl_info info;
+      if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) {
+         return FALLBACK_CLANG_RESOURCE_DIR;
+      }
+
+      char *libclang_path = realpath(info.dli_fname, NULL);
+      if (libclang_path == nullptr) {
+         return FALLBACK_CLANG_RESOURCE_DIR;
+      }
+
+      // GetResourcePath is a way to retrieve the actual libclang resource dir based on a given
+      // binary or library.
+      std::string clang_resource_dir =
+#if LLVM_VERSION_MAJOR >= 20
+         clang::driver::Driver::GetResourcesPath(std::string(libclang_path));
+#else
+         clang::driver::Driver::GetResourcesPath(std::string(libclang_path), CLANG_RESOURCE_DIR);
+#endif
+      free(libclang_path);
+
+      return clang_resource_dir;
+   }
+
+    std::unique_ptr<Module>
+    compile(LLVMContext &ctx, clang::CompilerInstance &c,
+            const std::string &name, const std::string &source,
+@@ -331,25 +359,18 @@ namespace {
+       c.getFrontendOpts().ProgramAction = clang::frontend::EmitLLVMOnly;
+       c.getHeaderSearchOpts().UseBuiltinIncludes = true;
+       c.getHeaderSearchOpts().UseStandardSystemIncludes = true;
+-      c.getHeaderSearchOpts().ResourceDir = CLANG_RESOURCE_DIR;
+ 
+-      if (use_libclc) {
+-         // Add libclc generic search path
+-         c.getHeaderSearchOpts().AddPath(LIBCLC_INCLUDEDIR,
+-                                         clang::frontend::Angled,
+-                                         false, false);
+      std::string clang_resource_dir = getResourceDirectory();
+      c.getHeaderSearchOpts().ResourceDir = clang_resource_dir;
+ 
+-         // Add libclc include
+-         c.getPreprocessorOpts().Includes.push_back("clc/clc.h");
+-      } else {
+-         // Add opencl-c generic search path
+-         c.getHeaderSearchOpts().AddPath(CLANG_RESOURCE_DIR,
+-                                         clang::frontend::Angled,
+-                                         false, false);
+      // Add opencl-c generic search path
+      std::string clang_include_path = clang_resource_dir + "/include";
+      c.getHeaderSearchOpts().AddPath(clang_include_path,
+                                      clang::frontend::Angled,
+                                      false, false);
+ 
+-         // Add opencl include
+-         c.getPreprocessorOpts().Includes.push_back("opencl-c.h");
+-      }
+      // Add opencl include
+      c.getPreprocessorOpts().Includes.push_back("opencl-c.h");
+ 
+       // Add definition for the OpenCL version
+       const auto dev_version = dev.device_version();
+diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build
+index e569b86a1be..56a9894f0db 100644
+--- a/src/gallium/frontends/clover/meson.build
+++ b/src/gallium/frontends/clover/meson.build
+@@ -10,7 +10,6 @@ clover_opencl_cpp_args = [
+   '-DCL_USE_DEPRECATED_OPENCL_2_0_APIS',
+   '-DCL_USE_DEPRECATED_OPENCL_2_1_APIS',
+   '-DCL_USE_DEPRECATED_OPENCL_2_2_APIS',
+-  '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'includedir')),
+   '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_variable(pkgconfig : 'libexecdir'))
+ ]
+ clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux]
+@@ -43,9 +42,9 @@ libclllvm = static_library(
+   cpp_args : [
+     clover_cpp_args,
+     clover_opencl_cpp_args,
+-    '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(
+    '-DFALLBACK_CLANG_RESOURCE_DIR="@0@"'.format(join_paths(
+       dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir'), 'clang',
+-      dep_llvm.version(), 'include',
+      dep_llvm.version()
+     )),
+   ],
+   gnu_symbol_visibility : 'hidden',
+-- 
+2.43.0
+
--- a/U_fix-mpeg1_2-decode-mesa-20.2.patch
+++ b/U_fix-mpeg1_2-decode-mesa-20.2.patch
@@ -3,11 +3,11 @@
 src/gallium/drivers/r600/evergreen_state.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-Index: mesa-23.3.0/src/gallium/drivers/r600/evergreen_state.c
+Index: mesa-24.2.2/src/gallium/drivers/r600/evergreen_state.c
 ===================================================================
--- mesa-23.3.0.orig/src/gallium/drivers/r600/evergreen_state.c
-+++ mesa-23.3.0/src/gallium/drivers/r600/evergreen_state.c
-@@ -598,7 +598,8 @@ static void *evergreen_create_sampler_st
+--- mesa-24.2.2.orig/src/gallium/drivers/r600/evergreen_state.c
+++ mesa-24.2.2/src/gallium/drivers/r600/evergreen_state.c
+@@ -584,7 +584,8 @@ static void *evergreen_create_sampler_st
 						       : state->max_anisotropy;
 	unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso);
 	bool trunc_coord = state->min_img_filter == PIPE_TEX_FILTER_NEAREST &&
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -20,7 +20,6 @@ Mesa-devel
 	requires "Mesa-libGLESv1_CM-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv2-devel-<targettype> = <version>"
 	requires "Mesa-libIndirectGL-devel-<targettype> = <version>"
-	requires "Mesa-libglapi-devel-<targettype> = <version>"
 	requires "libOSMesa-devel-<targettype> = <version>"
 	requires "libgbm-devel-<targettype> = <version>"
 	requires "libglvnd-devel-<targettype> >= 0.1.0"
@@ -66,9 +65,6 @@ libOSMesa-devel
 libgbm1
 libgbm-devel
 	requires "libgbm1-<targettype> = <version>"
-Mesa-libglapi0
-Mesa-libglapi-devel
-	requires "Mesa-libglapi0-<targettype> = <version>"
 Mesa-libd3d
 	provides "d3dadapter9.so.1"
 Mesa-libd3d-devel
@@ -107,3 +103,4 @@ Mesa-dri
 	supplements "Mesa-<targettype> = <version>"
 Mesa-gallium
 	supplements "Mesa-<targettype> = <version>"
+Mesa-libva
--- a/mesa-24.1.3.tar.xz
+++ b/mesa-24.1.3.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63236426b25a745ba6aa2d6daf8cd769d5ea01887b0745ab7124d2ef33a9020d
-size 29086488
--- a/mesa-24.1.3.tar.xz.sig
+++ b/mesa-24.1.3.tar.xz.sig
--- a/mesa-24.1.4.tar.xz
+++ b/mesa-24.1.4.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cf7c6f665263ad0122889c1d4b076654c1eedea7a2f38c69c8c51579937ade1
-size 29106920
--- a/mesa-24.1.4.tar.xz.sig
+++ b/mesa-24.1.4.tar.xz.sig
--- a/mesa-24.1.7.tar.xz
+++ b/mesa-24.1.7.tar.xz
--- a/mesa-24.1.7.tar.xz.sig
+++ b/mesa-24.1.7.tar.xz.sig
--- a/mesa-25.0.5.tar.xz
+++ b/mesa-25.0.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0d245dea0aa4b49f74b3d474b16542e4a8799791cd33d676c69f650ad4378d0
+size 46793824
--- a/mesa-25.0.5.tar.xz.sig
+++ b/mesa-25.0.5.tar.xz.sig
--- a/n_add-Mesa-headers-again.patch
+++ b/n_add-Mesa-headers-again.patch
@@ -1,8 +1,8 @@
-Index: mesa-24.0.3/include/meson.build
+Index: mesa-24.2.2/include/meson.build
 ===================================================================
--- mesa-24.0.3.orig/include/meson.build
-+++ mesa-24.0.3/include/meson.build
-@@ -28,7 +28,6 @@ if with_android_stub
+--- mesa-24.2.2.orig/include/meson.build
+++ mesa-24.2.2/include/meson.build
+@@ -12,7 +12,6 @@ if with_android_stub
   inc_include += [include_directories('android_stub')]
 endif
 
@@ -10,7 +10,7 @@ Index: mesa-24.0.3/include/meson.build
   if with_gles1 or with_gles2 or with_opengl or with_egl
     install_headers('KHR/khrplatform.h', subdir : 'KHR')
   endif
-@@ -84,7 +83,6 @@ if not with_glvnd and host_machine.syste
+@@ -68,7 +67,6 @@ if not with_glvnd and host_machine.syste
       subdir : 'EGL',
     )
   endif
--- a/n_drirc-disable-rgb10-for-chromium-on-amd.patch
+++ b/n_drirc-disable-rgb10-for-chromium-on-amd.patch
@@ -1,8 +1,8 @@
-Index: mesa-23.2.0-rc4/src/util/00-mesa-defaults.conf
+Index: mesa-24.3.0-rc1/src/util/00-mesa-defaults.conf
 ===================================================================
--- mesa-23.2.0-rc4.orig/src/util/00-mesa-defaults.conf
-+++ mesa-23.2.0-rc4/src/util/00-mesa-defaults.conf
-@@ -956,6 +956,14 @@ TODO: document the other workarounds.
+--- mesa-24.3.0-rc1.orig/src/util/00-mesa-defaults.conf
+++ mesa-24.3.0-rc1/src/util/00-mesa-defaults.conf
+@@ -1040,6 +1040,14 @@ TODO: document the other workarounds.
         <application name="Rocket League" executable="RocketLeague">
             <option name="radeonsi_zerovram" value="true" />
         </application>
--- a/n_stop-iris-flicker.patch
+++ b/n_stop-iris-flicker.patch
@@ -4,11 +4,11 @@ Date:   Tue May 24 14:47:53 2022 -0400

    Adjusting 'iris_batch.c' per 'https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731'.

-Index: mesa-24.1.0/src/gallium/drivers/iris/i915/iris_kmd_backend.c
+Index: mesa-24.2.2/src/gallium/drivers/iris/i915/iris_kmd_backend.c
 ===================================================================
--- mesa-24.1.0.orig/src/gallium/drivers/iris/i915/iris_kmd_backend.c
-+++ mesa-24.1.0/src/gallium/drivers/iris/i915/iris_kmd_backend.c
-@@ -317,7 +317,6 @@ i915_batch_submit(struct iris_batch *bat
+--- mesa-24.2.2.orig/src/gallium/drivers/iris/i915/iris_kmd_backend.c
+++ mesa-24.2.2/src/gallium/drivers/iris/i915/iris_kmd_backend.c
+@@ -318,7 +318,6 @@ i915_batch_submit(struct iris_batch *bat
          uint32_t flags = EXEC_OBJECT_SUPPORTS_48B_ADDRESS | EXEC_OBJECT_PINNED;
          flags |= bo->real.capture ? EXEC_OBJECT_CAPTURE : 0;
          flags |= bo == batch->screen->workaround_bo ? EXEC_OBJECT_ASYNC : 0;
--- a/proc-macro2-1.0.70.tar.gz
+++ b/proc-macro2-1.0.70.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b
-size 44343
--- a/proc-macro2-1.0.86.tar.gz
+++ b/proc-macro2-1.0.86.tar.gz
--- a/python36-buildfix1-s390x.patch
+++ b/python36-buildfix1-s390x.patch
@@ -0,0 +1,67 @@
+Index: mesa-24.1.7/src/nouveau/headers/class_parser.py
+===================================================================
+--- mesa-24.1.7.orig/src/nouveau/headers/class_parser.py
+++ mesa-24.1.7/src/nouveau/headers/class_parser.py
+@@ -9,6 +9,16 @@ import sys
+ 
+ from mako.template import Template
+ 
+def removeprefix(s, prefix):
+    if s.startswith(prefix):
+        return s[len(prefix):]
+    return s
+
+def removesuffix(s, suffix):
+    if s.endswith(suffix):
+        return s[:-len(suffix)]
+    return s
+
+ METHOD_ARRAY_SIZES = {
+     'BIND_GROUP_CONSTANT_BUFFER'                        : 16,
+     'CALL_MME_DATA'                                     : 256,
+@@ -293,7 +303,7 @@ def parse_header(nvcl, f):
+                 if ":" in list[2]:
+                     state = 1
+                 elif teststr in list[1]:
+-                    curmthd.field_defs[curfield][list[1].removeprefix(teststr)] = list[2]
+                    curmthd.field_defs[curfield][removeprefix(list[1], teststr)] = list[2]
+                 else:
+                     state = 1
+ 
+@@ -303,7 +313,7 @@ def parse_header(nvcl, f):
+                     if ("0x" in list[2]):
+                         state = 1
+                     else:
+-                        field = list[1].removeprefix(teststr)
+                        field = removeprefix(list[1], teststr)
+                         bitfield = list[2].split(":")
+                         curmthd.field_name_start[field] = bitfield[1]
+                         curmthd.field_name_end[field] = bitfield[0]
+@@ -324,13 +334,13 @@ def parse_header(nvcl, f):
+                 is_array = 0
+                 if (':' in list[2]):
+                     continue
+-                name = list[1].removeprefix(teststr)
+                name = removeprefix(list[1], teststr)
+                 if name.endswith("(i)"):
+                     is_array = 1
+-                    name = name.removesuffix("(i)")
+                    name = removesuffix(name, "(i)")
+                 if name.endswith("(j)"):
+                     is_array = 1
+-                    name = name.removesuffix("(j)")
+                    name = removesuffix(name, "(j)")
+                 x = method()
+                 x.name = name
+                 x.addr = list[2]
+@@ -357,8 +367,8 @@ def main():
+ 
+     clheader = os.path.basename(args.in_h)
+     nvcl = clheader
+-    nvcl = nvcl.removeprefix("cl")
+-    nvcl = nvcl.removesuffix(".h")
+    nvcl = removeprefix(nvcl, "cl")
+    nvcl = removesuffix(nvcl, ".h")
+     nvcl = nvcl.upper()
+     nvcl = "NV" + nvcl
+ 
--- a/python36-buildfix1.patch
+++ b/python36-buildfix1.patch
@@ -1,8 +1,8 @@
-Index: mesa-24.1.0/src/nouveau/headers/class_parser.py
+Index: mesa-24.3.0-rc1/src/nouveau/headers/class_parser.py
 ===================================================================
--- mesa-24.1.0.orig/src/nouveau/headers/class_parser.py
-+++ mesa-24.1.0/src/nouveau/headers/class_parser.py
-@@ -9,6 +9,16 @@ import sys
+--- mesa-24.3.0-rc1.orig/src/nouveau/headers/class_parser.py
+++ mesa-24.3.0-rc1/src/nouveau/headers/class_parser.py
+@@ -11,6 +11,16 @@ import subprocess
 
 from mako.template import Template
 
@@ -17,9 +17,9 @@ Index: mesa-24.1.0/src/nouveau/headers/class_parser.py
 +    return s
 +
 METHOD_ARRAY_SIZES = {
-     'BIND_GROUP_CONSTANT_BUFFER'                        : 16,
-     'CALL_MME_DATA'                                     : 256,
-@@ -293,7 +303,7 @@ def parse_header(nvcl, f):
+     'BIND_GROUP_CONSTANT_BUFFER'                            : 16,
+     'CALL_MME_DATA'                                         : 256,
+@@ -425,7 +435,7 @@ def parse_header(nvcl, f):
                 if ":" in list[2]:
                     state = 1
                 elif teststr in list[1]:
@@ -28,7 +28,7 @@ Index: mesa-24.1.0/src/nouveau/headers/class_parser.py
                 else:
                     state = 1
 
-@@ -303,7 +313,7 @@ def parse_header(nvcl, f):
+@@ -435,7 +445,7 @@ def parse_header(nvcl, f):
                     if ("0x" in list[2]):
                         state = 1
                     else:
@@ -37,7 +37,7 @@ Index: mesa-24.1.0/src/nouveau/headers/class_parser.py
                         bitfield = list[2].split(":")
                         curmthd.field_name_start[field] = bitfield[1]
                         curmthd.field_name_end[field] = bitfield[0]
-@@ -324,13 +334,13 @@ def parse_header(nvcl, f):
+@@ -456,13 +466,13 @@ def parse_header(nvcl, f):
                 is_array = 0
                 if (':' in list[2]):
                     continue
@@ -54,7 +54,7 @@ Index: mesa-24.1.0/src/nouveau/headers/class_parser.py
                 x = method()
                 x.name = name
                 x.addr = list[2]
-@@ -357,8 +367,8 @@ def main():
+@@ -552,8 +562,8 @@ def main():
 
     clheader = os.path.basename(args.in_h)
     nvcl = clheader
--- a/python36-buildfix2.patch
+++ b/python36-buildfix2.patch
@@ -1,6 +1,8 @@
--- mesa-23.3.3/src/freedreno/registers/gen_header.py.orig	2024-01-20 14:01:30.261999839 +0100
-+++ mesa-23.3.3/src/freedreno/registers/gen_header.py	2024-01-20 14:01:57.678558692 +0100
-@@ -781,7 +781,7 @@ def main():
+Index: mesa-24.3.0-rc1/src/freedreno/registers/gen_header.py
+===================================================================
+--- mesa-24.3.0-rc1.orig/src/freedreno/registers/gen_header.py
+++ mesa-24.3.0-rc1/src/freedreno/registers/gen_header.py
+@@ -957,7 +957,7 @@ def main():
 	parser.add_argument('--rnn', type=str, required=True)
 	parser.add_argument('--xml', type=str, required=True)
 
--- a/revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
+++ b/revert_8c91624614c1f939974fe0d2d1a3baf83335cecb.patch
@@ -0,0 +1,14 @@
+--- b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
+++ a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c
+@@ -608,11 +608,6 @@
+    if (flags & RADEON_FLAG_GTT_WC)
+       request.flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC;
+ 
+-   if (aws->info.has_local_buffers &&
+-       initial_domain & (RADEON_DOMAIN_VRAM_GTT | RADEON_DOMAIN_DOORBELL) &&
+-       flags & RADEON_FLAG_NO_INTERPROCESS_SHARING)
+-      request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID;
+-
+    if (flags & RADEON_FLAG_DISCARDABLE &&
+        aws->info.drm_minor >= 47)
+       request.flags |= AMDGPU_GEM_CREATE_DISCARDABLE;
--- a/syn-2.0.39.tar.gz
+++ b/syn-2.0.39.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
-size 244129
--- a/syn-2.0.68.tar.gz
+++ b/syn-2.0.68.tar.gz
--- a/tlsdesc_test.patch
+++ b/tlsdesc_test.patch
@@ -0,0 +1,15 @@
+LTO defeats the -fpic workaround and enables TLS relaxation anyway
+
+Index: mesa-24.3.0-rc1/meson.build
+===================================================================
+--- mesa-24.3.0-rc1.orig/meson.build
+++ mesa-24.3.0-rc1/meson.build
+@@ -516,7 +516,7 @@ if not have_mtls_dialect
+     foreach tlsdesc_arg : ['-mtls-dialect=gnu2', '-mtls-dialect=desc']
+       # -fpic to force dynamic tls, otherwise TLS relaxation defeats check
+       tlsdesc_test = cc.run('int __thread x; int main() { return x; }',
+-                            args: [tlsdesc_arg, '-fpic'],
+                            args: [tlsdesc_arg, '-fpic', '-fno-lto'],
+                             name: tlsdesc_arg)
+       if tlsdesc_test.returncode() == 0 and (
+             # check for lld 13 bug: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5665
--- a/u_dep_xcb-s390x.patch
+++ b/u_dep_xcb-s390x.patch
@@ -0,0 +1,16 @@
+Index: mesa-24.2.2/meson.build
+===================================================================
+--- mesa-24.2.2.orig/meson.build
+++ mesa-24.2.2/meson.build
+@@ -2145,9 +2145,11 @@ if with_platform_x11
+     endif
+   endif
+   if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
+    dep_x11_xcb = dependency('x11-xcb')
+     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
+ 
+     if with_dri3
+      dep_xcb = dependency('xcb')
+       dep_xcb_dri3 = dependency('xcb-dri3')
+       dep_xcb_present = dependency('xcb-present')
+       # until xcb-dri3 has been around long enough to make a hard-dependency:
--- a/u_dep_xcb.patch
+++ b/u_dep_xcb.patch
@@ -1,16 +1,15 @@
-Index: mesa-24.0.3/meson.build
+Index: mesa-25.0.0/meson.build
 ===================================================================
--- mesa-24.0.3.orig/meson.build
-+++ mesa-24.0.3/meson.build
-@@ -2069,9 +2069,11 @@ if with_platform_x11
+--- mesa-25.0.0.orig/meson.build
+++ mesa-25.0.0/meson.build
+@@ -2150,8 +2150,10 @@ if with_platform_x11
     endif
   endif
-   if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
+   if with_dri_platform == 'drm'
 +    dep_x11_xcb = dependency('x11-xcb')
-     dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
+     dep_xcb_dri2 = dependency('xcb-dri2', version : dep_xcb_dri2_version, required : with_x11_dri2)
 
-     if with_dri3
-+      dep_xcb = dependency('xcb')
-       dep_xcb_dri3 = dependency('xcb-dri3')
-       dep_xcb_present = dependency('xcb-present')
-       # until xcb-dri3 has been around long enough to make a hard-dependency:
+    dep_xcb = dependency('xcb')
+     dep_xcb_dri3 = dependency('xcb-dri3', version : dep_xcb_dri3_version)
+     dep_xcb_present = dependency('xcb-present', version : dep_xcb_present_version)
+     if (dep_xcb_dri3.version().version_compare('>= 1.17') and
--- a/u_intel-drop-annotations-from-spv2hex.patch
+++ b/u_intel-drop-annotations-from-spv2hex.patch
@@ -0,0 +1,25 @@
+From 93d7b176c290c8fce39349d9f320b1b302d79e83 Mon Sep 17 00:00:00 2001
+From: Mikhail Paulyshka <me@mixaill.net>
+Date: Thu, 20 Feb 2025 15:53:39 +0300
+Subject: [PATCH 1/1] intel: drop annotations from spv2hex
+
+fixes compatibility with python 2.6
+---
+ src/intel/shaders/spv2hex.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/intel/shaders/spv2hex.py b/src/intel/shaders/spv2hex.py
+index f07e4bfa375..59a66e05a79 100644
+--- a/src/intel/shaders/spv2hex.py
+++ b/src/intel/shaders/spv2hex.py
+@@ -2,7 +2,6 @@
+ # Copyright © 2025 Intel Corporation
+ # SPDX-License-Identifier: MIT
+ 
+-from __future__ import annotations
+ import argparse
+ import binascii
+ 
+-- 
+2.48.1
+
--- a/u_mesa-CVE-2023-45913-s390x.patch
+++ b/u_mesa-CVE-2023-45913-s390x.patch
@@ -0,0 +1,13 @@
+ src/glx/dri2_glx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
+@@ -1399,7 +1399,7 @@ dri2GetGlxDrawableFromXDrawableId(Displa
+    struct dri2_display *pdp = (struct dri2_display *) d->dri2Display;
+    __GLXDRIdrawable *pdraw;
+ 
+-   if (__glxHashLookup(pdp->dri2Hash, id, (void *) &pdraw) == 0)
+   if (pdp && __glxHashLookup(pdp->dri2Hash, id, (void *) &pdraw) == 0)
+       return pdraw;
+ 
+    return NULL;
--- a/u_mesa-CVE-2023-45913.patch
+++ b/u_mesa-CVE-2023-45913.patch
@@ -0,0 +1,15 @@
+ src/glx/dri2_glx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Index: mesa-24.3.0-rc1/src/glx/dri2_glx.c
+===================================================================
+--- mesa-24.3.0-rc1.orig/src/glx/dri2_glx.c
+++ mesa-24.3.0-rc1/src/glx/dri2_glx.c
+@@ -756,7 +756,7 @@ dri2GetGlxDrawableFromXDrawableId(Displa
+    struct glx_display *d = __glXInitialize(dpy);
+    __GLXDRIdrawable *pdraw;
+ 
+-   if (__glxHashLookup(d->dri2Hash, id, (void *) &pdraw) == 0)
+   if (d && __glxHashLookup(d->dri2Hash, id, (void *) &pdraw) == 0)
+       return pdraw;
+ 
+    return NULL;
--- a/u_mesa-CVE-2023-45919.patch
+++ b/u_mesa-CVE-2023-45919.patch
@@ -0,0 +1,33 @@
+ src/glx/glx_query.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+Index: mesa-24.3.0-rc1/src/glx/glx_query.c
+===================================================================
+--- mesa-24.3.0-rc1.orig/src/glx/glx_query.c
+++ mesa-24.3.0-rc1/src/glx/glx_query.c
+@@ -56,6 +56,13 @@ __glXQueryServerString(Display * dpy, CA
+    /* The spec doesn't mention this, but the Xorg server replies with
+     * a string already terminated with '\0'. */
+    uint32_t len = xcb_glx_query_server_string_string_length(reply);
+   /* Allow a max of 64kb string length */
+   size_t reply_len = strnlen(xcb_glx_query_server_string_string(reply), 64*1024);
+   if (reply_len + 1 != len)
+   {
+      free(reply);
+      return(NULL);
+   }
+    char *buf = malloc(len);
+    memcpy(buf, xcb_glx_query_server_string_string(reply), len);
+    free(reply);
+@@ -83,6 +90,12 @@ __glXGetString(Display * dpy, CARD32 con
+    /* The spec doesn't mention this, but the Xorg server replies with
+     * a string already terminated with '\0'. */
+    uint32_t len = xcb_glx_get_string_string_length(reply);
+   size_t reply_len = strnlen(xcb_glx_get_string_string(reply), 64*1024);
+   if (reply_len + 1 != len)
+   {
+      free(reply);
+      return(NULL);
+   }
+    char *buf = malloc(len);
+    memcpy(buf, xcb_glx_get_string_string(reply), len);
+    free(reply);
--- a/u_mesa-CVE-2023-45922.patch
+++ b/u_mesa-CVE-2023-45922.patch
@@ -0,0 +1,15 @@
+ src/glx/glx_pbuffer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Index: mesa-24.3.0-rc1/src/glx/glx_pbuffer.c
+===================================================================
+--- mesa-24.3.0-rc1.orig/src/glx/glx_pbuffer.c
+++ mesa-24.3.0-rc1/src/glx/glx_pbuffer.c
+@@ -338,7 +338,7 @@ __glXGetDrawableAttribute(Display * dpy,
+          /* Search the set of returned attributes for the attribute requested by
+           * the caller.
+           */
+-         for (i = 0; i < num_attributes; i++) {
+         for (i = 0; i < num_attributes && i * 2 + 1 < length; i++) {
+             if (data[i * 2] == attribute) {
+                found = 1;
+                *value = data[(i * 2) + 1];
--- a/u_meson-lower-python-version-requirement.patch
+++ b/u_meson-lower-python-version-requirement.patch
@@ -0,0 +1,25 @@
+From accbfc5464112a8cd368f0293a7f1e91ff769304 Mon Sep 17 00:00:00 2001
+From: Mikhail Paulyshka <me@mixaill.net>
+Date: Thu, 20 Feb 2025 15:17:05 +0300
+Subject: [PATCH 1/1] meson: lower python version requirement
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1bd2bbc0a64..14cbe5b13d2 100644
+--- a/meson.build
+++ b/meson.build
+@@ -936,7 +936,7 @@ if get_option('allow-kcmp') \
+ endif
+ 
+ # On Windows, a venv has no versioned aliased to 'python'.
+-prog_python = find_program('python3', 'python', version : '>= 3.8')
+prog_python = find_program('python3', 'python', version : '>= 3.6')
+ 
+ has_mako = run_command(
+   prog_python, '-c',
+-- 
+2.48.1
+