Accepting request 1169406 from X11:XOrg

- Update to bugfix release 24.0.5
- supersedes mesa-fix-llvm18.patch
- adjusted 0004-glx-pass-implicit-load-param-through-allocation.patch,
  0010-glx-silence-more-implicit-load-zink-errors.patch

OBS-URL: https://build.opensuse.org/request/show/1169406
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=501

0004-glx-pass-implicit-load-param-through-allocation.patch

@@ -7,10 +7,10 @@ Subject: [PATCH 4/9] glx: pass implicit load param through allocation
  src/glx/glxext.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-Index: mesa-24.0.3/src/glx/glxext.c
+Index: mesa-24.0.5/src/glx/glxext.c
 ===================================================================
---- mesa-24.0.3.orig/src/glx/glxext.c
+--- mesa-24.0.5.orig/src/glx/glxext.c
-+++ mesa-24.0.3/src/glx/glxext.c
++++ mesa-24.0.5/src/glx/glxext.c
 @@ -763,7 +763,7 @@ glx_screen_cleanup(struct glx_screen *ps
  ** If that works then fetch the per screen configs data.
  */
@@ -44,7 +44,7 @@ Index: mesa-24.0.3/src/glx/glxext.c
  #endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */
  
        bool indirect = false;
-@@ -929,14 +929,14 @@ __glXInitialize(Display * dpy)
+@@ -930,14 +930,14 @@ __glXInitialize(Display * dpy)
     }
  #endif
  
@@ -55,16 +55,16 @@ Index: mesa-24.0.3/src/glx/glxext.c
        if (try_zink) {
           free(dpyPriv->screens);
           dpyPriv->driswDisplay->destroyDisplay(dpyPriv->driswDisplay);
-          dpyPriv->driswDisplay = driswCreateDisplay(dpy, false);
+          dpyPriv->driswDisplay = driswCreateDisplay(dpy, TRY_ZINK_NO);
 -         fail = !AllocAndFetchScreenConfigs(dpy, dpyPriv, False);
 +         fail = !AllocAndFetchScreenConfigs(dpy, dpyPriv, False, true);
        }
  #endif
        if (fail) {
-Index: mesa-24.0.3/src/glx/glxclient.h
+Index: mesa-24.0.5/src/glx/glxclient.h
 ===================================================================
---- mesa-24.0.3.orig/src/glx/glxclient.h
+--- mesa-24.0.5.orig/src/glx/glxclient.h
-+++ mesa-24.0.3/src/glx/glxclient.h
++++ mesa-24.0.5/src/glx/glxclient.h
 @@ -78,6 +78,8 @@ typedef struct __GLXDRIdisplayRec __GLXD
  typedef struct __GLXDRIscreenRec __GLXDRIscreen;
  typedef struct __GLXDRIdrawableRec __GLXDRIdrawable;

0010-glx-silence-more-implicit-load-zink-errors.patch

@@ -7,10 +7,10 @@ Subject: [PATCH] glx: silence more implicit-load zink errors
  src/glx/drisw_glx.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: mesa-24.0.3/src/glx/drisw_glx.c
+Index: mesa-24.0.5/src/glx/drisw_glx.c
 ===================================================================
---- mesa-24.0.3.orig/src/glx/drisw_glx.c
+--- mesa-24.0.5.orig/src/glx/drisw_glx.c
-+++ mesa-24.0.3/src/glx/drisw_glx.c
++++ mesa-24.0.5/src/glx/drisw_glx.c
 @@ -980,7 +980,8 @@ driswCreateScreenDriver(int screen, stru
                                      extensions,
                                      &driver_configs, implicit, psc);
@@ -21,30 +21,3 @@ Index: mesa-24.0.3/src/glx/drisw_glx.c
        goto handle_error;
     }
  
-@@ -1049,7 +1050,8 @@ driswCreateScreenDriver(int screen, stru
-    glx_screen_cleanup(&psc->base);
-    free(psc);
- 
--   CriticalErrorMessageF("failed to load driver: %s\n", driver);
-+   if (pdpyp->zink == TRY_ZINK_YES && !implicit)
-+      CriticalErrorMessageF("failed to load driver: %s\n", driver);
- 
-    return NULL;
- }
-Index: mesa-24.0.3/src/glx/glxclient.h
-===================================================================
---- mesa-24.0.3.orig/src/glx/glxclient.h
-+++ mesa-24.0.3/src/glx/glxclient.h
-@@ -133,6 +133,12 @@ struct __GLXDRIdrawableRec
-    int refcount;
- };
- 
-+enum try_zink {
-+   TRY_ZINK_NO,
-+   TRY_ZINK_INFER,
-+   TRY_ZINK_YES,
-+};
-+
- /*
- ** Function to create and DRI display data and initialize the display
- ** dependent methods.

Mesa.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Apr 20 12:23:09 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 24.0.5
+- supersedes mesa-fix-llvm18.patch
+- adjusted 0004-glx-pass-implicit-load-param-through-allocation.patch,
+  0010-glx-silence-more-implicit-load-zink-errors.patch
+
 -------------------------------------------------------------------
 Wed Apr  3 06:55:12 UTC 2024 - Fei Yang <io@feiyang.eu.org>
 

Mesa.spec

@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 24.0.3
+%define _version 24.0.5
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -123,7 +123,7 @@
 %endif
 
 Name:           Mesa%{psuffix}
-Version:        24.0.3
+Version:        24.0.5
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -142,8 +142,6 @@ Patch11:        u_0001-intel-genxml-Drop-from-__future__-import-annotations.patc
 Patch12:        u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch
 Patch13:        python36-buildfix1.patch
 Patch14:        python36-buildfix2.patch
-# PATCH-FIX-UPSTREAM - boo#1221664
-Patch15:        mesa-fix-llvm18.patch
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
 Patch58:        u_dep_xcb.patch
@@ -773,7 +771,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %if 0%{?suse_version} < 1550
 %patch -P 14 -p1
 %endif
-%patch -P 15 -p1
 # no longer needed since gstreamer-plugins-vaapi 1.18.4
 %if 0%{?suse_version} < 1550
 %patch -P 54 -p1

mesa-24.0.3.tar.xz

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

mesa-24.0.5.tar.xz

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

mesa-fix-llvm18.patch

@@ -1,47 +0,0 @@
-From 99f0449987bec1f82cd42a06f40bb4a863a37792 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Mon, 11 Mar 2024 14:45:41 +0100
-Subject: [PATCH] Pass no-verify-fixpoint option to instcombine in LLVM 18
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When LLVM 18 is used, pass the no-verify-fixpoint option when
-running the instcombine pass. Otherwise LLVM may abort with an
-error.
-
-The background here is that this option is enabled by default for
-testing purposes, because instcombine is normally only explicitly
-invoked like this inside tests. If it is used in an actual
-production pipeline, the no-verify-fixpoint option needs to be
-enabled.
-
-This should fix the issue reported at
-https://bugzilla.redhat.com/show_bug.cgi?id=2268800.
-
-Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
-Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28101>
----
- src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-index cd2108f3a088d..1345d85b22439 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -609,7 +609,11 @@ gallivm_compile_module(struct gallivm_state *gallivm)
-    LLVMRunPasses(gallivm->module, passes, LLVMGetExecutionEngineTargetMachine(gallivm->engine), opts);
- 
-    if (!(gallivm_perf & GALLIVM_PERF_NO_OPT))
-+#if LLVM_VERSION_MAJOR >= 18
-+      strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,instsimplify,instcombine<no-verify-fixpoint>");
-+#else
-       strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,instsimplify,instcombine");
-+#endif
-    else
-       strcpy(passes, "mem2reg");
- 
--- 
-GitLab
-