Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package Mesa for openSUSE:Factory checked in 
at 2025-05-31 19:15:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Mesa (Old)
 and      /work/SRC/openSUSE:Factory/.Mesa.new.16005 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "Mesa"

Sat May 31 19:15:02 2025 rev:544 rq:1281613 version:unknown

Changes:
--------
--- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes        2025-05-23 
14:31:21.314610692 +0200
+++ /work/SRC/openSUSE:Factory/.Mesa.new.16005/Mesa.changes     2025-05-31 
19:15:20.834990217 +0200
@@ -2,41 +1,0 @@
-Wed May 21 08:33:31 UTC 2025 - Stefan Dirsch <[email protected]>
-
-- Update to release 25.1.1
-  -->  https://docs.mesa3d.org/relnotes/25.1.1   
-- supersedes the following patches
-  * U_0001-radv-driconf-Add-radv_force_64k_sparse_alignment-con.patch 
-  * U_0002-driconf-Add-workarounds-for-DOOM-The-Dark-Ages.patch
-
--------------------------------------------------------------------
-Fri May 16 12:10:20 UTC 2025 - Stefan Dirsch <[email protected]>
-
-- U_0001-radv-driconf-Add-radv_force_64k_sparse_alignment-con.patch
-  U_0002-driconf-Add-workarounds-for-DOOM-The-Dark-Ages.patch
-  * fixes issues with DOOM: The Dark Ages
-
--------------------------------------------------------------------
-Fri May  9 12:40:24 UTC 2025 - Stefan Dirsch <[email protected]>
-
-- build d3d12 video driver only when %vdpau_d3d12 is set
-
--------------------------------------------------------------------
-Fri May  9 11:12:21 UTC 2025 - Stefan Dirsch <[email protected]>
-
-- enable panfrost vulkan driver on Leap 16.0
-
--------------------------------------------------------------------
-Thu May  8 13:39:58 UTC 2025 - Stefan Dirsch <[email protected]>
-
-- Update to release 25.1.0
-  -->  https://docs.mesa3d.org/relnotes/25.1.0 
-- adjusted patches:
-  * python36-buildfix1.patch
-  * n_drirc-disable-rgb10-for-chromium-on-amd.patch,
-- supersedes the following patches:
-  * python36-buildfix2.patch
-  * u_intel-drop-annotations-from-spv2hex.patch
-  * U_clover-Don-t-include-libclc-headers.patch
-- osmesa no longer available; it's considered redundant with EGL
-  surfaceless
-
--------------------------------------------------------------------

Old:
----
  mesa-25.1.1.tar.xz
  mesa-25.1.1.tar.xz.sig

New:
----
  U_clover-Don-t-include-libclc-headers.patch
  mesa-25.0.5.tar.xz
  mesa-25.0.5.tar.xz.sig
  python36-buildfix2.patch
  u_intel-drop-annotations-from-spv2hex.patch

BETA DEBUG BEGIN:
  New:
- U_clover-Don-t-include-libclc-headers.patch
  * don't break clover with libclc 20.1.0 update (boo#1240848)
  New:  * python36-buildfix1.patch
  * python36-buildfix2.patch
  * tlsdesc_test.patch
  New:- 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
BETA DEBUG END:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.tP4dEn/_old  2025-05-31 19:15:24.619146601 +0200
+++ /var/tmp/diff_new_pack.tP4dEn/_new  2025-05-31 19:15:24.619146601 +0200
@@ -43,7 +43,7 @@
 %define glamor 1
 %define _name_archive mesa
 %ifnarch s390x
-%define _version 25.1.1
+%define _version 25.0.5
 %else
 %define _version 24.1.7
 %endif
@@ -91,13 +91,9 @@
     %if 0%{?suse_version} > 1600
       %define vulkan_drivers 
swrast,amd,broadcom,freedreno,intel,intel_hasvk,nouveau,panfrost
     %else
-      %if 0%{?suse_version} == 1600 && 0%{?is_opensuse}
-        %define vulkan_drivers 
swrast,amd,broadcom,freedreno,intel,intel_hasvk,panfrost
-      %else
         %define vulkan_drivers swrast,amd,broadcom,freedreno,intel,intel_hasvk
       %endif
     %endif
-  %endif
   %ifarch riscv64
     %define with_vulkan 1
     %define vulkan_drivers swrast,amd,intel,intel_hasvk
@@ -160,7 +156,7 @@
 
 Name:           Mesa%{psuffix}
 %ifnarch s390x
-Version:        25.1.1
+Version:        25.0.5
 %else
 Version:        24.1.7
 %endif
@@ -191,8 +187,8 @@
 Source10:       Mesa-rpmlintrc
 Source11:       Mesa.keyring
 Source12:       README-suse-maintenance.md
-Source20:       https://archive.mesa3d.org/%{_name_archive}-25.1.1.tar.xz
-Source21:       https://archive.mesa3d.org/%{_name_archive}-25.1.1.tar.xz.sig
+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
@@ -201,6 +197,7 @@
 %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
@@ -213,6 +210,8 @@
 %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
@@ -397,6 +396,7 @@
 %ifarch s390x
 Requires:       Mesa-libglapi-devel = %{version}
 %endif
+Requires:       libOSMesa-devel = %{version}
 Requires:       libgbm-devel = %{version}
 Provides:       Mesa-devel-static = %{version}
 Provides:       xorg-x11-Mesa-devel = %{version}
@@ -553,6 +553,18 @@
 This package provides a development environment for building
 applications using the OpenGL|ES 3.x APIs.
 
+%package -n libOSMesa8
+Summary:        Mesa Off-screen rendering extension
+# Wrongly named package shipped .so.8
+Group:          System/Libraries
+Obsoletes:      libOSMesa9 < %{version}
+Provides:       libOSMesa9 = %{version}
+
+%description -n libOSMesa8
+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 libglapi0
 Summary:        Free implementation of the GL API
 Group:          System/Libraries
@@ -572,6 +584,16 @@
 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
@@ -871,6 +893,9 @@
 %patch -P 11 -p1
 %patch -P 12 -p1
 %patch -P 13 -p1
+%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
@@ -881,6 +906,8 @@
 %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
@@ -915,11 +942,13 @@
 %meson \
             --auto-features=disabled \
 %if "%{flavor}" == "drivers"
+            -Dosmesa=false \
             -Dglx=disabled \
             -Dxmlconfig=enabled \
             -Dexpat=enabled \
             -Dshader-cache=enabled \
 %else
+            -Dosmesa=true \
             -Dglx=auto \
             -Dllvm=disabled \
             -Dvulkan-drivers= \
@@ -970,9 +999,7 @@
 %endif
   %ifarch %{ix86} x86_64
             
-Dgallium-drivers=r300,r600,radeonsi,nouveau,softpipe,llvmpipe,svga,virgl,iris,crocus,i915,d3d12,zink
 \
-          %if %{vdpau_d3d12}
             -Dgallium-d3d12-video=enabled \
-          %endif
             -Dgallium-d3d12-graphics=enabled \
             -Dintel-rt=enabled \
   %else
@@ -1067,7 +1094,6 @@
 
 # in libgbm-devel
 rm -fv %{buildroot}%{_includedir}/gbm.h \
-       %{buildroot}%{_includedir}/gbm_backend_abi.h \
        %{buildroot}%{_libdir}/libgbm.so* \
        %{buildroot}%{_libdir}/pkgconfig/gbm.pc
 
@@ -1109,6 +1135,7 @@
 %ldconfig_scriptlets
 %ldconfig_scriptlets libEGL1
 %ldconfig_scriptlets libGL1
+%ldconfig_scriptlets -n libOSMesa8
 %ldconfig_scriptlets -n libgbm1
 %ldconfig_scriptlets -n libxatracker2
 %ldconfig_scriptlets libglapi0
@@ -1139,6 +1166,7 @@
 %files libGL-devel
 %dir %{_includedir}/GL
 %{_includedir}/GL/*.h
+%exclude %{_includedir}/GL/osmesa.h
 %{_libdir}/pkgconfig/gl.pc
 %{_mandir}/man3/gl[A-Z]*
 
@@ -1153,12 +1181,20 @@
 %files libGLESv3-devel
 %{_includedir}/GLES3
 
+%files -n libOSMesa8
+%{_libdir}/libOSMesa.so.8.0.0
+%{_libdir}/libOSMesa.so.8
+
+%files -n libOSMesa-devel
+%{_includedir}/GL/osmesa.h
+%{_libdir}/libOSMesa.so
+%{_libdir}/pkgconfig/osmesa.pc
+
 %files -n libgbm1
 %{_libdir}/libgbm.so.1*
 
 %files -n libgbm-devel
 %{_includedir}/gbm.h
-%{_includedir}/gbm_backend_abi.h
 %{_libdir}/libgbm.so
 %{_libdir}/pkgconfig/gbm.pc
 %endif


++++++ U_clover-Don-t-include-libclc-headers.patch ++++++
>From e4eb5e80c316c0af3fff310ca89e1175d81556c1 Mon Sep 17 00:00:00 2001
From: Nikita Popov <[email protected]>
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 <[email protected]>
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


++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.tP4dEn/_old  2025-05-31 19:15:24.819154867 +0200
+++ /var/tmp/diff_new_pack.tP4dEn/_new  2025-05-31 19:15:24.819154867 +0200
@@ -20,6 +20,7 @@
        requires "Mesa-libGLESv1_CM-devel-<targettype> = <version>"
        requires "Mesa-libGLESv2-devel-<targettype> = <version>"
        requires "Mesa-libIndirectGL-devel-<targettype> = <version>"
+       requires "libOSMesa-devel-<targettype> = <version>"
        requires "libgbm-devel-<targettype> = <version>"
        requires "libglvnd-devel-<targettype> >= 0.1.0"
        obsoletes "XFree86-Mesa-devel-<targettype> 
xorg-x11-Mesa-devel-<targettype>"
@@ -56,6 +57,11 @@
        requires "Mesa-libEGL-devel-<targettype> = <version>"
         # Mesa-KHR-devel contains only header files, so no -<targettype> 
variant
        requires "Mesa-KHR-devel = <version>"
+libOSMesa8
+       obsoletes "libOSMesa9-<targettype> < <version>"
+       provides "libOSMesa9-<targettype> = <version>"
+libOSMesa-devel
+       requires "libOSMesa8-<targettype> = <version>"
 libgbm1
 libgbm-devel
        requires "libgbm1-<targettype> = <version>"


++++++ mesa-25.1.1.tar.xz -> mesa-25.0.5.tar.xz ++++++
/work/SRC/openSUSE:Factory/Mesa/mesa-25.1.1.tar.xz 
/work/SRC/openSUSE:Factory/.Mesa.new.16005/mesa-25.0.5.tar.xz differ: char 26, 
line 1

++++++ n_drirc-disable-rgb10-for-chromium-on-amd.patch ++++++
--- /var/tmp/diff_new_pack.tP4dEn/_old  2025-05-31 19:15:24.891157842 +0200
+++ /var/tmp/diff_new_pack.tP4dEn/_new  2025-05-31 19:15:24.895158008 +0200
@@ -1,8 +1,8 @@
-Index: mesa-25.1.0/src/util/00-mesa-defaults.conf
+Index: mesa-24.3.0-rc1/src/util/00-mesa-defaults.conf
 ===================================================================
---- mesa-25.1.0.orig/src/util/00-mesa-defaults.conf
-+++ mesa-25.1.0/src/util/00-mesa-defaults.conf
-@@ -803,6 +803,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>
@@ -14,7 +14,7 @@
 +        <application name="Totem" executable="totem">
 +            <option name="allow_rgb10_configs" value="false" />
 +        </application>
-         <!-- YoYo game engine workarounds -->
-         <application name="Monolith demo5" executable="runner" 
sha1="0c40d509a74e357f0280cb1bd882e9cd94b91bdf">
-             <option name="radeonsi_sync_compile" value="true" />
+         <application name="Gfx Bench" executable="gfxbench_gl">
+             <!-- Helps offscreen tests -->
+             <option name="mesa_glthread_app_profile" value="1"/>
 

++++++ python36-buildfix1.patch ++++++
--- /var/tmp/diff_new_pack.tP4dEn/_old  2025-05-31 19:15:24.931159495 +0200
+++ /var/tmp/diff_new_pack.tP4dEn/_new  2025-05-31 19:15:24.935159661 +0200
@@ -1,7 +1,7 @@
-Index: mesa-25.1.0/src/nouveau/headers/class_parser.py
+Index: mesa-24.3.0-rc1/src/nouveau/headers/class_parser.py
 ===================================================================
---- mesa-25.1.0.orig/src/nouveau/headers/class_parser.py
-+++ mesa-25.1.0/src/nouveau/headers/class_parser.py
+--- 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
@@ -19,25 +19,25 @@
  METHOD_ARRAY_SIZES = {
      'BIND_GROUP_CONSTANT_BUFFER'                            : 16,
      'CALL_MME_DATA'                                         : 256,
-@@ -467,7 +477,7 @@ def parse_header(nvcl, f):
+@@ -425,7 +435,7 @@ def parse_header(nvcl, f):
                  if ":" in list[2]:
                      state = 1
                  elif teststr in list[1]:
--                    curfield.defs[list[1].removeprefix(teststr)] = list[2]
-+                    curfield.defs[removeprefix(list[1],teststr)] = list[2]
+-                    
curmthd.field_defs[curfield][list[1].removeprefix(teststr)] = list[2]
++                    curmthd.field_defs[curfield][removeprefix(list[1], 
teststr)] = list[2]
                  else:
                      state = 1
  
-@@ -477,7 +487,7 @@ def parse_header(nvcl, f):
+@@ -435,7 +445,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(":")
-                         f = Field(field, bitfield[1], bitfield[0])
-                         curmthd.fields.append(f)
-@@ -497,13 +507,13 @@ def parse_header(nvcl, f):
+                         curmthd.field_name_start[field] = bitfield[1]
+                         curmthd.field_name_end[field] = bitfield[0]
+@@ -456,13 +466,13 @@ def parse_header(nvcl, f):
                  is_array = 0
                  if (':' in list[2]):
                      continue
@@ -51,27 +51,18 @@
                      is_array = 1
 -                    name = name.removesuffix("(j)")
 +                    name = removesuffix(name, "(j)")
- 
-                 curmthd = Method(name, list[2], is_array)
-                 methods[name] = curmthd
-@@ -512,8 +522,8 @@ def parse_header(nvcl, f):
-     return (version, methods)
- 
- def nvcl_for_filename(name):
--    name = name.removeprefix("cl")
--    name = name.removesuffix(".h")
-+    name = removeprefix(name, "cl")
-+    name = removesuffix(name, ".h")
-     return "NV" + name.upper()
- 
- def main():
-@@ -542,7 +552,7 @@ def main():
-     if args.prev_in_h is not None:
-         prev_clheader = os.path.basename(args.prev_in_h)
-         prev_nvcl = nvcl_for_filename(prev_clheader)
--        prev_mod = prev_clheader.removesuffix(".h")
-+        prev_mod = removesuffix(prev_clheader, ".h")
-         with open(args.prev_in_h, 'r', encoding='utf-8') as f:
-             (prev_version, prev_methods) = parse_header(prev_nvcl, f)
+                 x = method()
+                 x.name = name
+                 x.addr = list[2]
+@@ -552,8 +562,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
  
 

++++++ python36-buildfix2.patch ++++++
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)
 
-       subparsers = parser.add_subparsers(required=True)
+       subparsers = parser.add_subparsers()
 
        parser_c_defines = subparsers.add_parser('c-defines')
        parser_c_defines.set_defaults(func=dump_c_defines)

++++++ u_intel-drop-annotations-from-spv2hex.patch ++++++
>From 93d7b176c290c8fce39349d9f320b1b302d79e83 Mon Sep 17 00:00:00 2001
From: Mikhail Paulyshka <[email protected]>
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

Reply via email to