From 1653c6bf978c5144230f385a36cfd5d2d264d80f Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Sun, 18 Dec 2022 21:17:40 +0000
Subject: [PATCH] Update to 22.3.1

---
 ...x-fix-xshm-check-to-init-xshm_opcode.patch | 27 -------------------
 mesa.spec                                     |  3 +--
 sources                                       |  2 +-
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 0001-glx-fix-xshm-check-to-init-xshm_opcode.patch

diff --git a/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch b/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
deleted file mode 100644
index 1b2ec86..0000000
--- a/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/mesa.spec b/mesa.spec
index 3aba1f0..2b4d61f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -53,7 +53,7 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 22.3.0
+%global ver 22.3.1
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        %autorelease
 License:        MIT
@@ -66,7 +66,6 @@ Source0:        https://archive.mesa3d.org/mesa-%{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
 
 BuildRequires:  meson >= 0.61.4
 BuildRequires:  gcc
diff --git a/sources b/sources
index 058052e..6aeb5cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-22.3.0.tar.xz) = bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da
+SHA512 (mesa-22.3.1.tar.xz) = 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b