From 3b6ba0fc128bf7d96f9861355069b292ff6e0d03 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 8 Dec 2022 04:11:59 +0000
Subject: [PATCH] import mesa-22.3.0-1.el8

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

diff --git a/.gitignore b/.gitignore
index ddd9861..850f3ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mesa-22.3.0-rc4.tar.xz
+SOURCES/mesa-22.3.0.tar.xz
diff --git a/.mesa.metadata b/.mesa.metadata
index 06e9c3d..0816a3d 100644
--- a/.mesa.metadata
+++ b/.mesa.metadata
@@ -1 +1 @@
-435d8f79ff0d7750275d51b64a3626e7954052b0 SOURCES/mesa-22.3.0-rc4.tar.xz
+331db7d4590f10c99b79e801bb40fa6de491d572 SOURCES/mesa-22.3.0.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
new file mode 100644
index 0000000..1b2ec86
--- /dev/null
+++ b/SOURCES/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/SOURCES/Makefile b/SOURCES/Makefile
index 8c462af..872470c 100644
--- a/SOURCES/Makefile
+++ b/SOURCES/Makefile
@@ -1,4 +1,4 @@
-VERSION ?= 22.3.0-rc4
+VERSION ?= 22.3.0
 SANITIZE ?= 1
 
 DIRNAME = mesa-${VERSION}
diff --git a/SPECS/mesa.spec b/SPECS/mesa.spec
index a584ab9..c8e234f 100644
--- a/SPECS/mesa.spec
+++ b/SPECS/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