- Update to bugfix release 24.1.3

--> https://docs.mesa3d.org/relnotes/24.1.3
- supersedes the following patches:
  * u_dri-Fix-BGR-format-exclusion.patch
  * u_egl-gbm-Enable-RGBA-configs.patch
  * u_egl-surfaceless-Enable-RGBA-configs.patch
  * boo1226725-test-fix1.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1315

Mesa.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jul  4 12:26:06 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 24.1.3
+  --> https://docs.mesa3d.org/relnotes/24.1.3
+- supersedes the following patches:
+  * u_dri-Fix-BGR-format-exclusion.patch
+  * u_egl-gbm-Enable-RGBA-configs.patch
+  * u_egl-surfaceless-Enable-RGBA-configs.patch
+  * boo1226725-test-fix1.patch
+
 -------------------------------------------------------------------
 Thu Jul  4 09:47:12 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa.spec

@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 24.1.2
+%define _version 24.1.3
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -145,7 +145,7 @@
 %global _paste_crate_ver 1.0.14
 
 Name:           Mesa%{psuffix}
-Version:        24.1.2
+Version:        24.1.3
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -183,10 +183,6 @@ 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
-Patch500:       u_dri-Fix-BGR-format-exclusion.patch
-Patch501:       u_egl-gbm-Enable-RGBA-configs.patch
-Patch502:       u_egl-surfaceless-Enable-RGBA-configs.patch
-Patch503:       boo1226725-test-fix1.patch
 %ifarch %{ix86} x86_64
 BuildRequires:  DirectX-Headers
 %endif
@@ -841,10 +837,6 @@ cp %{SOURCE6} subprojects/packagecache/
 %patch -P 58 -p1
 %patch -P 100 -p1
 %patch -P 400 -p1
-%patch -P 500 -p1
-%patch -P 501 -p1
-%patch -P 502 -p1
-%patch -P 503 -p1
 
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...

boo1226725-test-fix1.patch

@@ -1,37 +0,0 @@
-diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
-index 2e9ce01147a..15dde5152b8 100644
---- a/src/gallium/frontends/dri/dri_screen.c
-+++ b/src/gallium/frontends/dri/dri_screen.c
-@@ -386,21 +386,16 @@ dri_fill_in_modes(struct dri_screen *screen)
-       uint8_t msaa_modes[MSAA_VISUAL_MAX_SAMPLES];
-
-       /* Expose only BGRA ordering if the loader doesn't support RGBA ordering. */
--      if (!allow_rgba_ordering) {
--          unsigned sh_ax = util_format_get_component_shift(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 3);
--          unsigned sh_b = util_format_get_component_shift(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 2);
--#if UTIL_ARCH_BIG_ENDIAN
--          unsigned sz_b = util_format_get_component_bits(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 2);
--
--          if (sz_b + sh_b == sh_ax)
--             continue;
--#else
--          unsigned sz_ax = util_format_get_component_bits(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 3);
--
--          if (sz_ax + sh_ax == sh_b)
--             continue;
--#endif
--       }
-+      if (!allow_rgba_ordering &&
-+          (pipe_formats[f] == PIPE_FORMAT_RGBA8888_UNORM ||
-+           pipe_formats[f] == PIPE_FORMAT_RGBX8888_UNORM ||
-+           pipe_formats[f] == PIPE_FORMAT_RGBA8888_SRGB  ||
-+           pipe_formats[f] == PIPE_FORMAT_RGBX8888_SRGB  ||
-+           pipe_formats[f] == PIPE_FORMAT_R5G5B5A1_UNORM ||
-+           pipe_formats[f] == PIPE_FORMAT_R5G5B5X1_UNORM ||
-+           pipe_formats[f] == PIPE_FORMAT_R4G4B4A4_UNORM ||
-+           pipe_formats[f] == PIPE_FORMAT_R4G4B4X4_UNORM))
-+         continue;
-
-       if (!allow_rgb10 &&
-           util_format_get_component_bits(pipe_formats[f],
-

mesa-24.1.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2c584c8d57d3bd8ba11790a6e9ae3713f8821df96c059b78afb29dd975c9f45
-size 29057184

mesa-24.1.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63236426b25a745ba6aa2d6daf8cd769d5ea01887b0745ab7124d2ef33a9020d
+size 29086488

u_dri-Fix-BGR-format-exclusion.patch

@@ -1,53 +0,0 @@
-From 79ca6e3a329dbfc3bc68df37b8f3ea7156e41aae Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Fri, 21 Jun 2024 11:24:31 +0100
-Subject: [PATCH] dri: Fix BGR format exclusion
-
-The check we had for BGR vs. RGB formats was testing completely the
-wrong thing. Fix it so we can restore the previous set of configs we
-expose to the frontend, which also fixes surfaceless platform on s390x.
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
-Fixes: ad0edea53a73 ("st/dri: Check format properties from format helpers")
-Closes: mesa/mesa#11360
----
- src/gallium/frontends/dri/dri_screen.c | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
-index 6bc61dbd641..debff54c090 100644
---- a/src/gallium/frontends/dri/dri_screen.c
-+++ b/src/gallium/frontends/dri/dri_screen.c
-@@ -386,17 +386,21 @@ dri_fill_in_modes(struct dri_screen *screen)
-       uint8_t msaa_modes[MSAA_VISUAL_MAX_SAMPLES];
- 
-       /* Expose only BGRA ordering if the loader doesn't support RGBA ordering. */
--      if (!allow_rgba_ordering &&
--          util_format_get_component_shift(pipe_formats[f],
--                                          UTIL_FORMAT_COLORSPACE_RGB, 0)
-+      if (!allow_rgba_ordering) {
-+          unsigned sh_ax = util_format_get_component_shift(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 3);
-+          unsigned sh_b = util_format_get_component_shift(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 2);
- #if UTIL_ARCH_BIG_ENDIAN
--         >
-+          unsigned sz_b = util_format_get_component_bits(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 2);
-+
-+          if (sz_b + sh_b == sh_ax)
-+             continue;
- #else
--         <
-+          unsigned sz_ax = util_format_get_component_bits(pipe_formats[f], UTIL_FORMAT_COLORSPACE_RGB, 3);
-+
-+          if (sz_ax + sh_ax == sh_b)
-+             continue;
- #endif
--          util_format_get_component_shift(pipe_formats[f],
--                                          UTIL_FORMAT_COLORSPACE_RGB, 2))
--         continue;
-+       }
- 
-       if (!allow_rgb10 &&
-           util_format_get_component_bits(pipe_formats[f],
--- 
-2.35.3
-

u_egl-gbm-Enable-RGBA-configs.patch

@@ -1,29 +0,0 @@
-From b3904d23ccc76b76d352a160164f293cf65305e0 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Fri, 21 Jun 2024 14:19:06 +0100
-Subject: [PATCH] egl/gbm: Enable RGBA configs
-
-Doing this is harmless since we operate on an allowlist of pipe_configs
-anyway.
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
----
- src/gbm/backends/dri/gbm_dri.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
-index 0526f4f8dc1..6cc2d5d8197 100644
---- a/src/gbm/backends/dri/gbm_dri.c
-+++ b/src/gbm/backends/dri/gbm_dri.c
-@@ -108,6 +108,8 @@ dri_get_capability(void *loaderPrivate, enum dri_loader_cap cap)
-    switch (cap) {
-    case DRI_LOADER_CAP_FP16:
-       return 1;
-+   case DRI_LOADER_CAP_RGBA_ORDERING:
-+      return 1;
-    default:
-       return 0;
-    }
--- 
-2.35.3
-

u_egl-surfaceless-Enable-RGBA-configs.patch

@@ -1,29 +0,0 @@
-From 1eb67fcae01d9f4fbe584e718d71cdfa745ce75f Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Fri, 21 Jun 2024 14:19:06 +0100
-Subject: [PATCH] egl/surfaceless: Enable RGBA configs
-
-Doing this is harmless since we operate on an allowlist of pipe_configs
-anyway.
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
----
- src/egl/drivers/dri2/platform_surfaceless.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
-index 0668ec9285f..4b69874d3f6 100644
---- a/src/egl/drivers/dri2/platform_surfaceless.c
-+++ b/src/egl/drivers/dri2/platform_surfaceless.c
-@@ -190,6 +190,8 @@ surfaceless_get_capability(void *loaderPrivate, enum dri_loader_cap cap)
-    switch (cap) {
-    case DRI_LOADER_CAP_FP16:
-       return 1;
-+   case DRI_LOADER_CAP_RGBA_ORDERING:
-+      return 1;
-    default:
-       return 0;
-    }
--- 
-2.35.3
-