Packman Build Service PMBS

Mesa.changes Changed

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Tue Oct  1 12:33:12 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+Tue Oct  1 12:14:24 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
 - u_mesa-CVE-2023-45913.patch
   * NULL pointer dereference via dri2GetGlxDrawableFromXDrawableId()
@@ -12,6 +12,339 @@
     (CVE-2023-45922, bsc#1222042) 
 
 -------------------------------------------------------------------
+Thu Jan 25 05:19:47 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 23.3.4
+  --> https://docs.mesa3d.org/relnotes/23.3.4.html
+
+-------------------------------------------------------------------
+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>
+
+- python36-buildfix.patch
+  * src/freedreno/registers/gen_header.py: hopefully fixes aarch64
+    build
+
+-------------------------------------------------------------------
+Sat Jan 20 11:22:42 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- u_0001-intel-genxml-Drop-from-__future__-import-annotations.patch
+  u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch
+  python36-buildfix.patch
+  * fixes build against python 3.6 
+
+-------------------------------------------------------------------
+Sat Jan 20 10:43:27 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- let Mesa-dri require libvulkan1 to get zink/swrast driver
+  fallbacks working (hopefully); probably related:
+  https://gitlab.freedesktop.org/mesa/mesa/-/commit/2a71f06f2938678d89d5ed1372cda6a7b55d964d
+
+-------------------------------------------------------------------
+Thu Jan 11 11:41:17 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+-  Update to bugfix release 23.3.3
+  --> https://docs.mesa3d.org/relnotes/23.3.3.html
+
+-------------------------------------------------------------------
+Sat Jan  6 14:24:41 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 23.3.2
+  --> https://docs.mesa3d.org/relnotes/23.3.2.html 
+
+-------------------------------------------------------------------
+Fri Dec  1 20:10:26 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 23.3.0:
+  * It includes NVK, a new reverse-engineered Vulkan driver for
+    Nvidia hardware. This driver is still in experimental phase,
+    not quite ready for prime time yet, but adventurous users can
+    give it a go!
+  * New extensions & features (in no particular order):
+    - VK_EXT_pipeline_robustness on ANV
+    - VK_KHR_maintenance5 on RADV
+    - OpenGL ES 3.1 on Asahi
+    - GL_ARB_compute_shader on Asahi
+    - GL_ARB_shader_atomic_counters on Asahi
+    - GL_ARB_shader_image_load_store on Asahi
+    - GL_ARB_shader_image_size on Asahi
+    - GL_ARB_shader_storage_buffer_object on Asahi
+    - GL_ARB_sample_shading on Asahi
+    - GL_OES_sample_variables on Asahi
+    - GL_OES_shader_multisample_interpolation on Asahi
+    - GL_OES_gpu_shader5 on Asahi
+    - EGL_ANDROID_blob_cache works when disk caching is disabled
+    - VK_KHR_cooperative_matrix on RADV/GFX11+
+- Drop patches fixed upstream:
+  * U_clover-llvm-move-to-modern-pass-manager.patch
+  * U_radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
+- Refresh patches with quilt.
+- Use %patch -p N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Mon Nov 20 14:53:17 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- buildrequire 'pkgconfig(SPIRV-Tools)' also with disabled rusticl
+  (new dep since some time)
+
+-------------------------------------------------------------------
+Mon Nov 20 14:44:53 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- re-disable rusticl on sle15-sp6 to prevent more deps (rust-bindgen)
+- buildrequire 'pkgconfig(LLVMSPIRVLib)' also with disabled rusticl
+  (new dep since some time)
+
+-------------------------------------------------------------------
+Mon Nov 20 14:40:06 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- enable rusticl on sle15-sp6
+
+-------------------------------------------------------------------
+Fri Nov 17 14:14:06 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- let sle15-sp6 require llvm17/clang17
+
+-------------------------------------------------------------------
+Wed Nov 15 10:24:35 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- build with valgrind only on 64bit platforms
+
+-------------------------------------------------------------------
+Sat Oct 14 22:31:08 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add U_radeonsi-prefix-function-with-si_-to-prevent-name-co.patch
+  Fix https://gitlab.freedesktop.org/mesa/mesa/-/issues/9889
+
+-------------------------------------------------------------------
+Wed Oct  4 10:11:42 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to Mesa 23.2.1
+  * Mesa 23.2.1 is a new development release. People who are
+    concerned with stability and reliability should stick with a
+    previous release or wait for Mesa 23.2.2.
+  * Mesa 23.2.1 is an unusual first stable release due to the
+    accidentl tagging of 23.2.0 durring the rc cycle.
+  * Mesa 23.2.1 implements the OpenGL 4.6 API, but the version
+    reported by glGetString(GL_VERSION) or
+    glGetIntegerv(GL_MAJOR_VERSION) /
+    glGetIntegerv(GL_MINOR_VERSION) depends on the particular
+    driver being used. Some drivers don't support all the features
+    required in OpenGL 4.6. OpenGL 4.6 is **only** available if
+    requested at context creation. Compatibility contexts may
+    report a lower version depending on each driver.
+  * Mesa 23.2.1 implements the Vulkan 1.3 API, but the version
+    reported by the apiVersion property of the
+    VkPhysicalDeviceProperties struct depends on the particular
+    driver being used.
+  * More details in:
+    --> https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.2/docs/relnotes/23.2.1.rst
+
+-------------------------------------------------------------------
+Mon Sep 25 09:46:58 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to Mesa 23.2.0-rc4
+  --> https://lists.freedesktop.org/archives/mesa-announce/2023-September/000731.html
+- supersedes U_llvmpipe-only-include-old-Transform-includes-when-ne.patch
+- disabled u_fix-build-on-ppc64le.patch (no longer needed?)
+- adjusted n_drirc-disable-rgb10-for-chromium-on-amd.patch
+
+-------------------------------------------------------------------
+Thu Sep 21 15:13:11 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Backport upstream patches for compatibility with LLVM 17:
+  * U_llvmpipe-only-include-old-Transform-includes-when-ne.patch
+    removes unneeded includes of header files that no longer exist.
+  * U_clover-llvm-move-to-modern-pass-manager.patch migrates Clover
+    to the new pass manager, since the old PM has been removed.
+
+-------------------------------------------------------------------
+Thu Sep 21 10:26:36 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- disable nine on arm/aarch64 in the hope to fix build on this
+  platform; there is no need for Direct3D/Wine for arm/aarch64
+  anyway ...
+
+-------------------------------------------------------------------
+Thu Sep 21 08:05:24 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 23.1.8:
+  --> https://docs.mesa3d.org/relnotes/23.1.8.html
+
+-------------------------------------------------------------------
+Thu Sep  7 07:02:41 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 23.1.7:
+  --> https://docs.mesa3d.org/relnotes/23.1.7.html
+
+-------------------------------------------------------------------
+Fri Sep  1 10:31:27 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- mini-cleanup for python package BuildRequires in specfile
+- added python3-dataclasses package for sle15/Leap15 to finally fix
+  build for these build targets; dataclasses module is in standard
+  library of python >= 3.7 ...
+
+-------------------------------------------------------------------
+Thu Aug 17 08:35:12 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to bugfix release 23.1.6:
+  --> https://docs.mesa3d.org/relnotes/23.1.6.html
+
+-------------------------------------------------------------------
+Thu Aug  3 09:40:17 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 23.1.5

Mesa.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 22.3.5
+%define _version 23.3.4
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -64,7 +64,7 @@
   %define vdpau_virtio_gpu 1
 %endif
 
-%ifarch %{ix86} x86_64 %{arm} aarch64
+%ifarch %{ix86} x86_64
   %define with_nine 1
 %endif
 
@@ -123,29 +123,31 @@
 %endif
 
 Name:           Mesa%{psuffix}
-Version:        22.3.5
+Version:        23.3.4
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
 Group:          System/Libraries
 URL:            https://www.mesa3d.org
 #Git-Clone:     git://anongit.freedesktop.org/mesa/mesa
-Source:         https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz
-Source1:        https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig
+Source:         https://archive.mesa3d.org/%{_name_archive}-%{_version}.tar.xz
+Source1:        https://archive.mesa3d.org/%{_name_archive}-%{_version}.tar.xz.sig
 Source2:        baselibs.conf
 Source3:        README.updates
 Source4:        manual-pages.tar.bz2
 Source6:        Mesa-rpmlintrc
 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-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
 Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch200:       u_fix-build-on-ppc64le.patch
-Patch300:       n_no-sse2-on-ix86-except-for-intel-drivers.patch
 Patch400:       n_stop-iris-flicker.patch
-Patch500:       U_ReturnME.patch
 Patch1222040:   u_mesa-CVE-2023-45913.patch
 Patch1222041:   u_mesa-CVE-2023-45919.patch
 Patch1222042:   u_mesa-CVE-2023-45922.patch
@@ -165,14 +167,14 @@
 BuildRequires:  imake
 BuildRequires:  libtool
 BuildRequires:  memory-constraints
-BuildRequires:  meson
+BuildRequires:  meson >= 0.60
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
-%if 0%{?suse_version} > 1320
-BuildRequires:  python3-mako
-%else
-BuildRequires:  python3-Mako
+# dataclasses is in standard library of python >= 3.7
+%if 0%{?suse_version} < 1550
+BuildRequires:  python3-dataclasses
 %endif
+BuildRequires:  python3-Mako
 BuildRequires:  python3-xml
 BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(dri3proto)
@@ -183,7 +185,7 @@
 BuildRequires:  pkgconfig(libdrm_nouveau) >= 2.4.66
 BuildRequires:  pkgconfig(libdrm_radeon) >= 2.4.71
 BuildRequires:  pkgconfig(libglvnd) >= 0.1.0
-%ifarch aarch64 %{ix86} x86_64 ppc64le s390x
+%ifarch aarch64 x86_64 ppc64le s390x
 BuildRequires:  pkgconfig(valgrind)
 %endif
 BuildRequires:  pkgconfig(libva)
@@ -246,18 +248,8 @@
 %if 0%{?suse_version} >= 1550
 BuildRequires:  llvm-devel
 %else
-%if 0%{?sle_version} >= 150500
-BuildRequires:  llvm15-devel
-%else
-%if 0%{?sle_version} >= 150400
-BuildRequires:  llvm13-devel
-%else
-%if 0%{?sle_version} >= 150300
-BuildRequires:  llvm11-devel
-%else
-BuildRequires:  llvm9-devel
-%endif
-%endif
+%if 0%{?sle_version} >= 150600
+BuildRequires:  llvm17-devel
 %endif
 %endif
 %endif
@@ -266,26 +258,16 @@
 %if 0%{?suse_version} >= 1550
 BuildRequires:  clang-devel
 %else
-%if 0%{?sle_version} >= 150500
-BuildRequires:  clang15-devel
-%else
-%if 0%{?sle_version} >= 150400
-BuildRequires:  clang13-devel
-%else
-%if 0%{?sle_version} >= 150300
-BuildRequires:  clang11-devel
-%else
-BuildRequires:  clang9-devel
-%endif
-%endif
+%if 0%{?sle_version} >= 150600
+BuildRequires:  clang17-devel
 %endif
 %endif
 BuildRequires:  libclc
+BuildRequires:  pkgconfig(LLVMSPIRVLib)
+BuildRequires:  pkgconfig(SPIRV-Tools)
 %if 0%{with_rusticl}
 BuildRequires:  rust
 BuildRequires:  rust-bindgen
-BuildRequires:  pkgconfig(LLVMSPIRVLib)
-BuildRequires:  pkgconfig(SPIRV-Tools)
 %endif
 %endif
 
@@ -528,6 +510,7 @@
 Summary:        DRI plug-ins for 3D acceleration
 Group:          System/Libraries
 Requires:       Mesa = %{version}
+Requires:       libvulkan1
 Supplements:    Mesa
 
 %description -n Mesa-dri
@@ -629,14 +612,6 @@
 %description -n libvdpau_nouveau
 This package contains the VDPAU state tracker for Nouveau.
 
-%package -n libvdpau_r300
-Summary:        VDPAU state tracker for R300
-Group:          System/Libraries
-Supplements:    modalias(pci:v00001002d*sv*sd*bc03sc*i*)
-
-%description -n libvdpau_r300
-This package contains the VDPAU state tracker for R300.
-
 %package -n libvdpau_r600
 Summary:        VDPAU state tracker for R600
 Group:          System/Libraries
@@ -782,23 +757,25 @@
 # remove some docs
 rm -rf docs/README.{VMS,WIN32,OS2}
 
-%patch2 -p1
-# no longer needed since gstreamer-plugins-vaapi 1.18.4
+%patch -P 2 -p1
+# fixes build against python 3.6
+%patch -P 11 -p1
+%patch -P 12 -p1
+%patch -P 13 -p1
 %if 0%{?suse_version} < 1550
-%patch54 -p1
+%patch -P 14 -p1
 %endif
-%patch58 -p1
-%patch100 -p1
-%patch200 -p1
-%ifarch %{ix86}
-%patch300 -p1
+# no longer needed since gstreamer-plugins-vaapi 1.18.4
+%if 0%{?suse_version} < 1550
+%patch -P 54 -p1
 %endif
-%patch400 -p1
-%patch500 -p1
+%patch -P 58 -p1
+%patch -P 100 -p1
+#%patch -P 200 -p1
+%patch -P 400 -p1
 %patch -P 1222040 -p1
 %patch -P 1222041 -p1

U_ReturnME.patch Deleted

@@ -1,54 +0,0 @@
-From 8491b1fd5e7c97edc104a3ac3b8ece5464e652b0 Mon Sep 17 00:00:00 2001
-From: Illia Polishchuk <illia.a.polishchuk@globallogic.com>
-Date: Fri, 13 Jan 2023 20:54:44 +0200
-Subject: PATCH ANV: Add extra memory types for ANV driver instead of a
- single one
-
-Some game engines can't handle single type well
-And Intel on Windows uses 3 types so it's better to add extra one here
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7360
-Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
-Signed-off-by: Illia Polishchuk <illia.a.polishchuk@globallogic.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20693>
----
- src/intel/vulkan/anv_device.c | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
-index a2e5d2ba398f..40d8949f011a 100644
---- a/src/intel/vulkan/anv_device.c
-+++ b/src/intel/vulkan/anv_device.c
-@@ -509,14 +509,23 @@ anv_physical_device_init_heaps(struct anv_physical_device *device, int fd)
- 
-       /* Big core GPUs share LLC with the CPU and thus one memory type can be
-        * both cached and coherent at the same time.
-+       *
-+       * But some game engines can't handle single type well
-+       * https://gitlab.freedesktop.org/mesa/mesa/-/issues/7360#note_1719438
-+       *
-+       * And Intel on Windows uses 3 types so it's better to add extra one here
-        */
--      device->memory.type_count = 1;
-+      device->memory.type_count = 2;
-       device->memory.types0 = (struct anv_memory_type) {
--         .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
--                          VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
--                          VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
--                          VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
--         .heapIndex = 0,
-+          .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
-+          .heapIndex = 0,
-+      };
-+      device->memory.types1 = (struct anv_memory_type) {
-+          .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
-+                           VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-+                           VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
-+                           VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
-+          .heapIndex = 0,
-       };
-    } else {
-       device->memory.heap_count = 1;
--- 
-GitLab
-

U_fix-mpeg1_2-decode-mesa-20.2.patch Changed

n_add-Mesa-headers-again.patch Changed

n_drirc-disable-rgb10-for-chromium-on-amd.patch Changed

n_no-sse2-on-ix86-except-for-intel-drivers.patch Deleted

@@ -1,42 +0,0 @@
-Index: mesa-22.2.0/meson.build
-===================================================================
---- mesa-22.2.0.orig/meson.build
-+++ mesa-22.2.0/meson.build
-@@ -1275,35 +1275,8 @@ if host_machine.system() == 'windows'
-   endif
- endif
- 
--if host_machine.cpu_family().startswith('x86') and cc.get_argument_syntax() != 'msvc'
--  pre_args += '-DUSE_SSE41'
--  with_sse41 = true
--  sse41_args = '-msse4.1'
--
--  if host_machine.cpu_family() == 'x86'
--    if get_option('sse2')
--      # These settings make generated GCC code match MSVC and follow
--      # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note
--      #
--      # NOTE: We need to ensure stack is realigned given that we
--      # produce shared objects, and have no control over the stack
--      # alignment policy of the application. Therefore we need
--      # -mstackrealign or -mincoming-stack-boundary=2.
--      #
--      # XXX: We could have SSE without -mstackrealign if we always used
--      # __attribute__((force_align_arg_pointer)), but that's not
--      # always the case.
--      c_args += '-msse2', '-mfpmath=sse', '-mstackrealign'
--    else
--      # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but
--      # that's not guaranteed
--      sse41_args += '-mstackrealign'
--    endif
--  endif
--else
--  with_sse41 = false
--  sse41_args = 
--endif
-+with_sse41 = false
-+sse41_args = 
- 
- # Check for GCC style atomics
- dep_atomic = null_dep

n_stop-iris-flicker.patch Changed

python36-buildfix1.patch Added

@@ -0,0 +1,65 @@
+--- mesa-23.3.3/src/nouveau/nvidia-headers/class_parser.py.orig	2024-01-20 12:47:36.464476669 +0100
++++ mesa-23.3.3/src/nouveau/nvidia-headers/class_parser.py	2024-01-20 13:04:30.212851443 +0100
+@@ -9,6 +9,16 @@
+ 
+ from mako.template import Template
+ 
++def removeprefix(s, prefix):
++    if s.startswith(prefix):
++        return slen(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,
+@@ -273,7 +283,7 @@
+                 if ":" in list2:
+                     state = 1
+                 elif teststr in list1:
+-                    curmthd.field_defscurfieldlist1.removeprefix(teststr) = list2
++                    curmthd.field_defscurfieldremoveprefix(list1, teststr) = list2
+                 else:
+                     state = 1
+ 
+@@ -283,7 +293,7 @@
+                     if ("0x" in list2):
+                         state = 1
+                     else:
+-                        field = list1.removeprefix(teststr)
++                        field = removeprefix(list1, teststr)
+                         bitfield = list2.split(":")
+                         curmthd.field_name_startfield = bitfield1
+                         curmthd.field_name_endfield = bitfield0
+@@ -304,13 +314,13 @@
+                 is_array = 0
+                 if (':' in list2):
+                     continue
+-                name = list1.removeprefix(teststr)
++                name = removeprefix(list1, 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 = list2
+@@ -336,8 +346,8 @@
+ 
+     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 Added

u_0001-intel-genxml-Drop-from-__future__-import-annotations.patch Added

@@ -0,0 +1,54 @@
+From a14fa9920669c8d6d911e375376f2e45052a31d6 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Sat, 20 Jan 2024 01:07:23 -0800
+Subject: PATCH 1/2 intel/genxml: Drop "from __future__ import annotations"
+
+This is not supported in Python 3.6, and optional in 3.7+.
+
+Ref: f1eae2f8bbe ("python: drop python2 support")
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ src/intel/genxml/gen_sort_tags.py | 1 -
+ src/intel/genxml/genxml_import.py | 1 -
+ src/intel/genxml/intel_genxml.py  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/src/intel/genxml/gen_sort_tags.py b/src/intel/genxml/gen_sort_tags.py
+index dcdba333fe6..44cd152cd11 100755
+--- a/src/intel/genxml/gen_sort_tags.py
++++ b/src/intel/genxml/gen_sort_tags.py
+@@ -2,7 +2,6 @@
+ # Copyright © 2019, 2022 Intel Corporation
+ # SPDX-License-Identifier: MIT
+ 
+-from __future__ import annotations
+ import argparse
+ import copy
+ import intel_genxml
+diff --git a/src/intel/genxml/genxml_import.py b/src/intel/genxml/genxml_import.py
+index 76a7c77eb4c..442b4726d08 100755
+--- a/src/intel/genxml/genxml_import.py
++++ b/src/intel/genxml/genxml_import.py
+@@ -2,7 +2,6 @@
+ # Copyright © 2019, 2022 Intel Corporation
+ # SPDX-License-Identifier: MIT
+ 
+-from __future__ import annotations
+ import argparse
+ import copy
+ import intel_genxml
+diff --git a/src/intel/genxml/intel_genxml.py b/src/intel/genxml/intel_genxml.py
+index 2b7b4d8391a..9388ebecfce 100755
+--- a/src/intel/genxml/intel_genxml.py
++++ b/src/intel/genxml/intel_genxml.py
+@@ -2,7 +2,6 @@
+ # Copyright © 2019, 2022 Intel Corporation
+ # SPDX-License-Identifier: MIT
+ 
+-from __future__ import annotations
+ from collections import OrderedDict
+ import copy
+ import io
+-- 
+2.35.3
+

u_0002-intel-genxml-Add-a-untyped-OrderedDict-fallback-for-.patch Added

@@ -0,0 +1,78 @@
+From 89ede5b851a6a15f85e83278257ee4e3783f6bd2 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Sat, 20 Jan 2024 01:00:56 -0800
+Subject: PATCH 2/2 intel/genxml: Add a untyped OrderedDict fallback for
+ Python 3.6
+
+typing.OrderedDict was introduced in Python 3.7.2.
+
+Python 3.6 and 3.7 have been deprecated and are no longer supported,
+but this seems like an easy enough fallback to include for now.
+
+https://devguide.python.org/versions/
+
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ src/intel/genxml/intel_genxml.py | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/src/intel/genxml/intel_genxml.py b/src/intel/genxml/intel_genxml.py
+index 9388ebecfce..eefd7b44992 100755
+--- a/src/intel/genxml/intel_genxml.py
++++ b/src/intel/genxml/intel_genxml.py
+@@ -45,10 +45,22 @@ BASE_TYPES = {
+ 
+ FIXED_PATTERN = re.compile(r"(s|u)(\d+)\.(\d+)")
+ 
++try:
++    # Python 3.7 and newer should be able to support strong typing for
++    # our OrderedDict usage.
++    def typed_ordered_dict(key_ty, val_ty):
++        return typing.OrderedDictstr, bool
++    # This will raise an exception on Python 3.6
++    typed_ordered_dict(int, int)
++except Exception:
++    # For Python 3.6 we return an untyped OrderedDict
++    def typed_ordered_dict(key_ty, val_ty):
++        return OrderedDict
++
+ def is_base_type(name: str) -> bool:
+     return name in BASE_TYPES or FIXED_PATTERN.match(name) is not None
+ 
+-def add_struct_refs(items: typing.OrderedDictstr, bool, node: et.Element) -> None:
++def add_struct_refs(items: typed_ordered_dict(str, bool), node: et.Element) -> None:
+     if node.tag == 'field':
+         if 'type' in node.attrib and not is_base_type(node.attrib'type'):
+             t = node.attrib'type'
+@@ -64,16 +76,16 @@ class Struct(object):
+     def __init__(self, xml: et.Element):
+         self.xml = xml
+         self.name = xml.attrib'name'
+-        self.deps: typing.OrderedDictstr, Struct = OrderedDict()
++        self.deps: typed_ordered_dict(str, Struct) = OrderedDict()
+ 
+     def find_deps(self, struct_dict, enum_dict) -> None:
+-        deps: typing.OrderedDictstr, bool = OrderedDict()
++        deps: typed_ordered_dict(str, bool) = OrderedDict()
+         add_struct_refs(deps, self.xml)
+         for d in deps.keys():
+             if d in struct_dict:
+                 self.depsd = struct_dictd
+ 
+-    def add_xml(self, items: typing.OrderedDictstr, et.Element) -> None:
++    def add_xml(self, items: typed_ordered_dict(str, et.Element)) -> None:
+         for d in self.deps.values():
+             d.add_xml(items)
+         itemsself.name = self.xml
+@@ -151,7 +163,7 @@ def sort_xml(xml: et.ElementTree) -> None:
+     for ws in wrapped_struct_dict.values():
+         ws.find_deps(wrapped_struct_dict, enum_dict)
+ 
+-    sorted_structs: typing.OrderedDictstr, et.Element = OrderedDict()
++    sorted_structs: typed_ordered_dict(str, et.Element) = OrderedDict()
+     for s in structs:
+         _s = wrapped_struct_dicts.attrib'name'
+         _s.add_xml(sorted_structs)
+-- 
+2.35.3
+

u_dep_xcb.patch Changed

@@ -1,8 +1,8 @@
-Index: mesa-22.3.5/meson.build
+Index: mesa-23.3.0/meson.build
 ===================================================================
---- mesa-22.3.5.orig/meson.build
-+++ mesa-22.3.5/meson.build
-@@ -2141,9 +2141,11 @@ if with_platform_x11
+--- mesa-23.3.0.orig/meson.build
++++ mesa-23.3.0/meson.build
+@@ -2022,9 +2022,11 @@ if with_platform_x11
      endif
    endif
    if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
@@ -14,16 +14,15 @@
        dep_xcb_dri3 = dependency('xcb-dri3')
        dep_xcb_present = dependency('xcb-present')
        # until xcb-dri3 has been around long enough to make a hard-dependency:
-Index: mesa-22.3.5/src/loader/meson.build
+Index: mesa-23.3.0/src/loader/meson.build
 ===================================================================
---- mesa-22.3.5.orig/src/loader/meson.build
-+++ mesa-22.3.5/src/loader/meson.build
-@@ -28,7 +28,7 @@ if with_platform_x11 and with_dri3
-     include_directories : inc_include, inc_src,
-     dependencies : 
-       dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
--      dep_xcb_xfixes, dep_xcb_xrandr,
-+      dep_xcb_xfixes, dep_xcb_xrandr, dep_xcb,
-     ,
-     build_by_default : false,
-   )
+--- mesa-23.3.0.orig/src/loader/meson.build
++++ mesa-23.3.0/src/loader/meson.build
+@@ -47,6 +47,6 @@ libloader = static_library(
+   c_args : loader_c_args,
+   gnu_symbol_visibility : 'hidden',
+   include_directories : inc_include, inc_src, inc_util,
+-  dependencies : dep_libdrm, dep_thread, dep_xcb_xrandr,
++  dependencies : dep_libdrm, dep_thread, dep_xcb_xrandr, dep_xcb,
+   build_by_default : false,
+ )

u_fix-build-on-ppc64le.patch Changed

@@ -1,7 +1,8 @@
-diff -u -r mesa-21.2.3.orig/include/CL/cl_platform.h mesa-21.2.3/include/CL/cl_platform.h
---- mesa-21.2.3.orig/include/CL/cl_platform.h	2021-10-14 12:26:03.866376943 +0200
-+++ mesa-21.2.3/include/CL/cl_platform.h	2021-10-14 20:37:44.557384820 +0200
-@@ -356,7 +356,9 @@
+Index: mesa-23.0.0/include/CL/cl_platform.h
+===================================================================
+--- mesa-23.0.0.orig/include/CL/cl_platform.h
++++ mesa-23.0.0/include/CL/cl_platform.h
+@@ -385,7 +385,9 @@ typedef unsigned int cl_GLenum;
  /* Define basic vector types */
  #if defined( __VEC__ )
    #if !defined(__clang__)
@@ -11,10 +12,11 @@
    #endif
     typedef __vector unsigned char     __cl_uchar16;
     typedef __vector signed char       __cl_char16;
-diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c
---- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c	2021-10-14 12:26:04.058380655 +0200
-+++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c	2021-10-14 20:38:55.478734888 +0200
-@@ -465,7 +465,9 @@
+Index: mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_rast_tri.c
+===================================================================
+--- mesa-23.0.0.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c
++++ mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_rast_tri.c
+@@ -488,7 +488,9 @@ lp_rast_triangle_32_3_4(struct lp_raster
  
  #if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN
  
@@ -24,11 +26,12 @@
  #include "util/u_pwr8.h"
  
  static inline void
-diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c
---- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c	2021-10-14 12:26:04.058380655 +0200
-+++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c	2021-10-14 20:38:24.766150222 +0200
-@@ -47,7 +47,9 @@
- #if defined(PIPE_ARCH_SSE)
+Index: mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+===================================================================
+--- mesa-23.0.0.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c
++++ mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+@@ -46,7 +46,9 @@
+ #if DETECT_ARCH_SSE
  #include <emmintrin.h>
  #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN
 +#ifndef __cplusplus

u_mesa-CVE-2023-45913.patch Changed

u_mesa-CVE-2023-45919.patch Changed

u_mesa-CVE-2023-45922.patch Changed

baselibs.conf Changed

@@ -75,9 +75,13 @@
 	requires "Mesa-libd3d-<targettype> = <version>"
 libvulkan_intel
 	targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch aarch64 +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
 	targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch ppc64 +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
 	targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch ppc64le +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
 	targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json
+	targetarch x86_64 +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
 	requires "Mesa-vulkan-device-select-<targettype> = <version>"
 	provides  "Mesa-libVulkan-devel-<targettype> = 22.0.0"
 	obsoletes "Mesa-libVulkan-devel-<targettype> < 22.0.0"
@@ -88,7 +92,6 @@
 	targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
 	requires "Mesa-vulkan-device-select-<targettype> = <version>"
 libvdpau_nouveau
-libvdpau_r300
 libvdpau_r600
 libvdpau_radeonsi
 libvdpau_virtio_gpu

mesa-22.3.5.tar.xz.sig Deleted

mesa-22.3.5.tar.xz -> mesa-23.3.4.tar.xz Changed

mesa-23.3.4.tar.xz.sig Added

Changes of Revision 2