diff --git a/mesa-28923.patch b/mesa-28923.patch deleted file mode 100644 index 315b045..0000000 --- a/mesa-28923.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8561958ccfd9b3a742a8742cc5931e9a6f6a7814 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= -Date: Thu, 25 Apr 2024 11:47:31 +0200 -Subject: [PATCH] meson: Disable proc_macro2 unestable features -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proc-macro2 >= 1.0.80 uses proc_macro_byte_character [1] and -proc_macro_c_str_literals [2]. -Disable them until they are available. - -[1] https://github.com/rust-lang/rust/issues/115268 -[2] https://github.com/rust-lang/rust/issues/119750 -Signed-off-by: José Expósito ---- - subprojects/packagefiles/proc-macro2/meson.build | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/subprojects/packagefiles/proc-macro2/meson.build b/subprojects/packagefiles/proc-macro2/meson.build -index b39d76e80c825..5bd635c80a389 100644 ---- a/subprojects/packagefiles/proc-macro2/meson.build -+++ b/subprojects/packagefiles/proc-macro2/meson.build -@@ -41,6 +41,12 @@ endif - if rc.version().version_compare('< 1.57') - rust_args += ['--cfg', 'no_is_available'] - endif -+if rc.version().version_compare('< 1.79') -+ rust_args += [ -+ '--cfg', 'no_literal_byte_character', -+ '--cfg', 'no_literal_c_string', -+ ] -+endif - - u_ind = subproject('unicode-ident').get_variable('lib') - --- -GitLab - diff --git a/mesa.spec b/mesa.spec index 126deb0..bd45f0b 100644 --- a/mesa.spec +++ b/mesa.spec @@ -66,7 +66,7 @@ Name: mesa Summary: Mesa graphics libraries -%global ver 24.1.0-rc3 +%global ver 24.1.0-rc4 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: %autorelease License: MIT AND BSD-3-Clause AND SGI-B-2.0 @@ -79,10 +79,6 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz Source1: Mesa-MLAA-License-Clarification-Email.txt Patch10: gnome-shell-glthread-disable.patch -# Work around for the meson bug until an upstream fix lands -# https://bugzilla.redhat.com/show_bug.cgi?id=2277018 -# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28923 -Patch11: mesa-28923.patch BuildRequires: meson >= 1.3.0 BuildRequires: gcc diff --git a/sources b/sources index d18ff33..026055d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mesa-24.1.0-rc3.tar.xz) = d75641a023ba489b5117b369a2d9007bcf6079f31375c9aa70afd968f8acc3695468e9cf2ef1989ed28459cf245fccd60507a0e8b0931401b77a4b2b21f0fe03 +SHA512 (mesa-24.1.0-rc4.tar.xz) = 8c31ea253543b1f8d1329eef9e20243ca7d6eb8c9645960bc53314de85ea8e3255d72816faa94935ba92e4802351c9a29e221d7e72048681de0a490bf4c52119