- libvdpau_gallium was linked directly into libgallium-*.so.*.

Drop the subpackage and provides/obsolete it via Mesa-dri which
  ships libgallium-*.so.*.

- drop u_fix_rust_bindgen.patch 
  included in update

- Update to release 24.2.3
  --> https://docs.mesa3d.org/relnotes/24.2.3

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1334

Mesa.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Sep 23 16:56:40 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- libvdpau_gallium was linked directly into libgallium-*.so.*.
+  Drop the subpackage and provides/obsolete it via Mesa-dri which
+  ships libgallium-*.so.*.
+
+-------------------------------------------------------------------
+Mon Sep 23 16:37:33 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- drop u_fix_rust_bindgen.patch 
+  included in update
+
+-------------------------------------------------------------------
+Mon Sep 23 16:32:05 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to release 24.2.3
+  --> https://docs.mesa3d.org/relnotes/24.2.3
+
 -------------------------------------------------------------------
 Mon Sep 23 10:58:19 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa.spec

@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package Mesa
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 24.2.2
+%define _version 24.2.3
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -145,7 +145,7 @@
 %global _paste_crate_ver 1.0.14
 
 Name:           Mesa%{psuffix}
-Version:        24.2.2
+Version:        24.2.3
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -178,7 +178,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
-Patch15:        u_fix_rust_bindgen.patch
 Patch16:        u_fix-llvm19-build.patch
 Patch17:        tlsdesc_test.patch
 # never to be upstreamed
@@ -559,6 +558,9 @@ Group:          System/Libraries
 Requires:       Mesa = %{version}
 Requires:       libvulkan1
 Supplements:    Mesa
+# merged into libgallium in 24.2.3
+Provides:       libvdpau_gallium = %{version}-%{release}
+Obsoletes:      libvdpau_gallium < %{version}-%{release}
 
 %description -n Mesa-dri
 This package contains Mesa DRI drivers for 3D acceleration.
@@ -650,13 +652,6 @@ Requires:       Mesa-libd3d = %{version}
 %description -n Mesa-libd3d-devel
 Mesa Direct3D9 state tracker development package
 
-%package -n libvdpau_gallium
-Summary:        VDPAU state tracker
-Group:          System/Libraries
-
-%description -n libvdpau_gallium
-This package contains the VDPAU state tracker.
-
 %package -n libvdpau_nouveau
 Summary:        VDPAU state tracker for Nouveau
 Group:          System/Libraries
@@ -845,7 +840,6 @@ cp %{SOURCE6} subprojects/packagecache/
 %if 0%{?suse_version} < 1550
 %patch -P 14 -p1
 %endif
-%patch -P 15 -p1
 %patch -P 16 -p1
 %patch -P 17 -p1
 # no longer needed since gstreamer-plugins-vaapi 1.18.4
@@ -1026,9 +1020,6 @@ rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc
 # in KHR-devel
 rm -rf %{buildroot}/%{_includedir}/KHR
 
-# workaround needed since Mesa 19.0.2
-rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so
-
 # in libgbm-devel
 rm -f %{buildroot}%{_includedir}/gbm.h
 rm -f %{buildroot}%{_libdir}/libgbm.so*
@@ -1167,8 +1158,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/libxatracker.so
 %{_libdir}/pkgconfig/xatracker.pc
 
-%files -n libvdpau_gallium
-%{_libdir}/vdpau/libvdpau_gallium.so.1.0.0
 %endif
 
 %if %{vdpau_nouveau}

mesa-24.2.2.tar.xz

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

mesa-24.2.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ea18b1155a4544a09f7361848974768f6f73c19d88f63de2ec650be313b2d0c
+size 29465732

u_fix_rust_bindgen.patch

@@ -1,40 +0,0 @@
-From 93e96da9458c9d0348f2390dc0bea67cf140b1a0 Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Sun, 18 Aug 2024 00:08:50 +0200
-Subject: [PATCH] rusticl: do not use CL vector types in bindings and code
-
-Bindgen seems to miscompile them and I kinda thought I've done this
-already in the past, but apparently not.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11722
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30710>
----
- src/gallium/frontends/rusticl/api/device.rs | 2 +-
- src/gallium/frontends/rusticl/meson.build   | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: mesa-24.2.2/src/gallium/frontends/rusticl/api/device.rs
-===================================================================
---- mesa-24.2.2.orig/src/gallium/frontends/rusticl/api/device.rs
-+++ mesa-24.2.2/src/gallium/frontends/rusticl/api/device.rs
-@@ -196,7 +196,7 @@ impl CLInfo<cl_device_info> for cl_devic
-             // TODO proper retrival from devices
-             CL_DEVICE_MEM_BASE_ADDR_ALIGN => cl_prop::<cl_uint>(0x1000),
-             CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE => {
--                cl_prop::<cl_uint>(size_of::<cl_ulong16>() as cl_uint)
-+                cl_prop::<cl_uint>(16 * size_of::<cl_ulong>() as cl_uint)
-             }
-             CL_DEVICE_NAME => cl_prop::<&str>(&dev.screen().name()),
-             CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR => cl_prop::<cl_uint>(1),
-Index: mesa-24.2.2/src/gallium/frontends/rusticl/meson.build
-===================================================================
---- mesa-24.2.2.orig/src/gallium/frontends/rusticl/meson.build
-+++ mesa-24.2.2/src/gallium/frontends/rusticl/meson.build
-@@ -158,6 +158,7 @@ rusticl_opencl_bindings_rs = rust.bindge
-     '--raw-line', 'unsafe impl std::marker::Sync for _cl_image_desc {}',
-     '--allowlist-type', 'cl_.*',
-     '--allowlist-type', 'cl.*_fn',
-+    '--blocklist-type', '(__)?cl_.*[2348(16)]',
-     '--allowlist-var', 'CL_.*',
-     # needed for gl_sharing extension
-     '--allowlist-var', 'GL_.*',