From 2b56d179c4f1815908a63cbb549eea65f54a759c Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Tue, 7 Nov 2023 12:00:06 +0000
Subject: [PATCH] import UBI mesa-23.1.4-1.el9

---
 .gitignore                                    |  2 +-
 .mesa.metadata                                |  2 +-
 ...x-fix-xshm-check-to-init-xshm_opcode.patch | 27 -------------------
 SPECS/mesa.spec                               | 14 +++++++---
 4 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100644 SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch

diff --git a/.gitignore b/.gitignore
index 850f3ae..94afea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mesa-22.3.0.tar.xz
+SOURCES/mesa-23.1.4.tar.xz
diff --git a/.mesa.metadata b/.mesa.metadata
index 2cbcbeb..75329b8 100644
--- a/.mesa.metadata
+++ b/.mesa.metadata
@@ -1 +1 @@
-a18b3d293b0809ad5159bdd91a8c269f02d40da1 SOURCES/mesa-22.3.0.tar.xz
+d534f7854afa284ca73cfa9aa2d7a1e1adccfc50 SOURCES/mesa-23.1.4.tar.xz
diff --git a/SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch b/SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
deleted file mode 100644
index 1b2ec86..0000000
--- a/SOURCES/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 808c054a42fd24a1aaefaeb1d95195fea9fb6e84 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 7 Dec 2022 05:11:47 +1000
-Subject: [PATCH] glx: fix xshm check to init xshm_opcode.
-
-Found and proposed by Ray Strode (halfline)
-
-Fixes: 68e89401140d ("glx/drisw: use xcb instead of X to query connection")
----
- src/glx/drisw_glx.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
-index c0d1e85fdc4..d7658eaf7c1 100644
---- a/src/glx/drisw_glx.c
-+++ b/src/glx/drisw_glx.c
-@@ -874,6 +874,7 @@ check_xshm(Display *dpy)
- 
-    shm_cookie = xcb_query_extension(c, 7, "MIT-SHM");
-    shm_reply = xcb_query_extension_reply(c, shm_cookie, NULL);
-+   xshm_opcode = shm_reply->major_opcode;
- 
-    has_mit_shm = shm_reply->present;
-    free(shm_reply);
--- 
-2.38.1
-
diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index 18c1f90..6fb3667 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/mesa.spec
@@ -52,9 +52,9 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 22.3.0
+%global ver 23.1.4
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
@@ -65,7 +65,6 @@ Source0:        https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch10:	gnome-shell-glthread-disable.patch
-Patch11:        0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
 Patch12:        radeonsi-turn-off-glthread.patch
 
 BuildRequires:  meson >= 0.45
@@ -350,6 +349,9 @@ cp %{SOURCE1} docs/
   -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \
   -Dbuild-tests=false \
   -Dselinux=true \
+  -Dlibunwind=disabled \
+  -Dlmsensors=disabled \
+  -Dandroid-libbacktrace=disabled \
   %{nil}
 %meson_build
 
@@ -603,6 +605,12 @@ popd
 %endif
 
 %changelog
+* Thu Jul 27 2023 Dave Airlie <airlied@redhat.com> - 23.1.4-1
+- Update to mesa 23.1.4
+
+* Wed May 17 2023 Dave Airlie <airlied@redhat.com> - 23.1.0-1
+- Update to mesa 23.1.0
+
 * Fri Jan 27 2023 Dave Airlie <airlied@redhat.com> - 22.3.0-2
 - Disable glthread, breaks gtk3/totem