From 00b760d3ef51a5b50075aa2cae6f03cca95307f5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 8 Dec 2022 04:12:15 +0000
Subject: [PATCH] Auto sync2gitlab import of mesa-22.3.0-1.el8.src.rpm

---
 .gitignore                                    |  1 +
 ...x-fix-xshm-check-to-init-xshm_opcode.patch | 27 +++++++++++++++++++
 Makefile                                      |  2 +-
 mesa.spec                                     |  8 ++++--
 sources                                       |  2 +-
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 0001-glx-fix-xshm-check-to-init-xshm_opcode.patch

diff --git a/.gitignore b/.gitignore
index c1c9f00..f5a2617 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mesa-22.1.1.tar.xz
 /mesa-22.1.5.tar.xz
 /mesa-22.3.0-rc4.tar.xz
+/mesa-22.3.0.tar.xz
diff --git a/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch b/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
new file mode 100644
index 0000000..1b2ec86
--- /dev/null
+++ b/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
@@ -0,0 +1,27 @@
+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/Makefile b/Makefile
index 8c462af..872470c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION ?= 22.3.0-rc4
+VERSION ?= 22.3.0
 SANITIZE ?= 1
 
 DIRNAME = mesa-${VERSION}
diff --git a/mesa.spec b/mesa.spec
index a584ab9..c8e234f 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -33,12 +33,12 @@
 
 %global sanitize 0
 
-%global rctag rc4
+#global rctag rc4
 
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        22.3.0
-Release:        0.4%{?rctag:.%{rctag}}%{?dist}
+Release:        1%{?rctag:.%{rctag}}%{?dist}
 
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -55,6 +55,7 @@ Source4:        Mesa-MLAA-License-Clarification-Email.txt
 Patch0:	lavapipe-disable-env-var.patch
 
 Patch10: gnome-shell-glthread-disable.patch
+Patch11: 0001-glx-fix-xshm-check-to-init-xshm_opcode.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -552,6 +553,9 @@ done
 %endif
 
 %changelog
+* Wed Dec 07 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-1
+- Update to 22.3.0 final + fix mit-shm regression
+
 * Fri Nov 25 2022 Dave Airlie <airlied@redhat.com> - 22.3.0-0.4
 - Disable glthread for gnome-shell
 
diff --git a/sources b/sources
index e110852..354670c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-22.3.0-rc4.tar.xz) = 6b3e1e757bd107d2343f51ca0d22a3303ef1a3da870bba1506ffb5e4fbfce53e947243ffbaf1da6c10e276fd3235ef41ea6422e902bc08a073db764b0b1c2838
+SHA512 (mesa-22.3.0.tar.xz) = d61ecb360cf48400ce2360611564740f90d518abfa62ab52015226bc24d4f65bb3768d08dfd48f9cb4564e430ea1fdfc0c933c06e18ba3b39cf8041fbaf430e0