Mesa/python36-buildfix1.patch
Stefan Dirsch 3480334669 - 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.

- 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

- 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

- 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

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1328
2024-09-16 09:17:49 +00:00

68 lines
2.5 KiB
Diff

Index: mesa-24.1.0/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
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