rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

- split python36-buildfix.patch into two patches python36-buildfix1.patch

Browse Source 
and python36-buildfix2.patch; apply the latter only on sle15-sp6/Leap 15.6
  since on newer python releases than 3.6 it changes behaviour to 
  remove required=True option

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1253
This commit is contained in:
Stefan Dirsch 2024-01-22 14:46:34 +00:00 committed by Git OBS Bridge
parent 3214aee2ca
commit 27079a373a
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mesa.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jan 22 14:36:33 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- split python36-buildfix.patch into two patches python36-buildfix1.patch
and python36-buildfix2.patch; apply the latter only on sle15-sp6/Leap 15.6
since on newer python releases than 3.6 it changes behaviour to
remove required=True option
-------------------------------------------------------------------
Sat Jan 20 13:04:02 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>

6
Mesa.spec
View File

@ -140,7 +140,8 @@ Source7: Mesa.keyring
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
Patch13: python36-buildfix.patch
Patch13: python36-buildfix1.patch
Patch14: python36-buildfix2.patch
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
@ -758,6 +759,9 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch -P 11 -p1
%patch -P 12 -p1
%patch -P 13 -p1
%if 0%{?suse_version} < 1550
%patch -P 14 -p1
%endif
# no longer needed since gstreamer-plugins-vaapi 1.18.4
%if 0%{?suse_version} < 1550
%patch -P 54 -p1

11
python36-buildfix.patch → python36-buildfix1.patch
View File

@ -63,14 +63,3 @@
nvcl = nvcl.upper()
nvcl = "NV" + nvcl
--- mesa-23.3.3/src/freedreno/registers/gen_header.py.orig 2024-01-20 14:01:30.261999839 +0100
+++ mesa-23.3.3/src/freedreno/registers/gen_header.py 2024-01-20 14:01:57.678558692 +0100
@@ -781,7 +781,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)

11
python36-buildfix2.patch Normal file
View File

@ -0,0 +1,11 @@
--- mesa-23.3.3/src/freedreno/registers/gen_header.py.orig 2024-01-20 14:01:30.261999839 +0100
+++ mesa-23.3.3/src/freedreno/registers/gen_header.py 2024-01-20 14:01:57.678558692 +0100
@@ -781,7 +781,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)