From a737976c54c6da13ffa180ac9ba44113d42aac6079807a60f148e01027ed8572 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 24 Jul 2023 11:04:09 +0000
Subject: [PATCH] - Update to bugfix release 23.1.4 - supersedes
 u_fix-glx-context-opengl-4.5.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1220
---
 Mesa.changes                       |   6 ++++++
 Mesa.spec                          |   6 ++----
 mesa-23.1.3.tar.xz                 |   3 ---
 mesa-23.1.3.tar.xz.sig             | Bin 310 -> 0 bytes
 mesa-23.1.4.tar.xz                 |   3 +++
 mesa-23.1.4.tar.xz.sig             | Bin 0 -> 310 bytes
 u_fix-glx-context-opengl-4.5.patch |  12 ------------
 7 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 mesa-23.1.3.tar.xz
 delete mode 100644 mesa-23.1.3.tar.xz.sig
 create mode 100644 mesa-23.1.4.tar.xz
 create mode 100644 mesa-23.1.4.tar.xz.sig
 delete mode 100644 u_fix-glx-context-opengl-4.5.patch

diff --git a/Mesa.changes b/Mesa.changes
index 52d14d0..678c2f5 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 24 09:36:23 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to bugfix release 23.1.4 
+- supersedes u_fix-glx-context-opengl-4.5.patch
+
 -------------------------------------------------------------------
 Fri Jun 23 07:24:59 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 396189e..2f6927c 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -42,7 +42,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 23.1.3
+%define _version 23.1.4
 %define with_opencl 0
 %define with_rusticl 0
 %define with_vulkan 0
@@ -123,7 +123,7 @@
 %endif
 
 Name:           Mesa%{psuffix}
-Version:        23.1.3
+Version:        23.1.4
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -144,7 +144,6 @@ Patch58:        u_dep_xcb.patch
 Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch200:       u_fix-build-on-ppc64le.patch
 Patch400:       n_stop-iris-flicker.patch
-Patch800:       u_fix-glx-context-opengl-4.5.patch
 %ifarch %{ix86} x86_64
 BuildRequires:  DirectX-Headers
 %endif
@@ -779,7 +778,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch100 -p1
 %patch200 -p1
 %patch400 -p1
-%patch800 -p1
 
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...
diff --git a/mesa-23.1.3.tar.xz b/mesa-23.1.3.tar.xz
deleted file mode 100644
index 054d1b3..0000000
--- a/mesa-23.1.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9
-size 18358052
diff --git a/mesa-23.1.3.tar.xz.sig b/mesa-23.1.3.tar.xz.sig
deleted file mode 100644
index e2fa01a19addd05b7c7cff903353d9aa8d28dcff5d730aff93336ed0ded5f4ab..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}0W$;u0SEvc79j*zRUP45mXBjW!btXwjxn#pBq*i@0%VkW`~V6G5RHy8
zufrrLriMBP{T`!0dj!DB0HR9>zk(c7q0g&SnI>&U4Dyv9+{m+^2!SodAx(>?Rbhda
zpw>w<1#Bx%ZO?UAL?-fFWLf712Ix_a^;K>X_g2zffE^{|e$h4|5lsEl>jc=5U8j5l
zE{kBj-VtXopx1)}N6Du7GN{qCYe~dg&UPp>I({IGxACRCbzX-Fjta4<|4X}XS|407
zp~M@N%D`|FKA!5bvPyTu1Z%Hl1@~}Q{)U#KYfyCCK%y_(b6M{eMHNYSkW@z3rB|&+
zc0w*f;{aI>_BOSfaL@SIu*Y5KtbKJ0mk*2TD@}y-52`Ib$2ZEmP{fn8fW!-(UEQk5
I^bi#$1USWvegFUf

diff --git a/mesa-23.1.4.tar.xz b/mesa-23.1.4.tar.xz
new file mode 100644
index 0000000..c1a33b2
--- /dev/null
+++ b/mesa-23.1.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7261a17fb94867e3dc5a90d8a1f100fa04b0cbbde51d25302c0872b5e9a10959
+size 18414456
diff --git a/mesa-23.1.4.tar.xz.sig b/mesa-23.1.4.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..598209f7d35574e9b6442c0a0835d85caa6e6d84612bbe9f03bc8cb3c2df3d6d
GIT binary patch
literal 310
zcmV-60m=S}0W$;u0SEvc79j*zRUP45mXBjW!btXwjxn#pBq*i@0%W>=O#liB5RHy8
zufrrLrp96j0GKX@8<^`PinMZY-h#(iX9-a{_Re|PffbVcf(I^}9i&{>^qfPi?zOsF
zqj<EPhL^-p5d(2vk13n}WtD=aDf5{Yd~P6B5v9X5HHpgawa!CSQg-cKs4wl~qW}9Q
z^h2ShQG^jZwrf~TnfZxJqn2D7oz?Om6zsaK=PRwMS%r4`BrkqX^t0P*M3E~JfPo#L
zzP$d3dp@$^^XUiS@r;cv7qFIn+WrR=pwI9@g&pK?ARt6s@DB(<#fx-R)@UZkanHP?
zpmlEC30aP`PlfzWFFGc%MQ@hS(yq)|I-8neR9Ev%2wXs#wBB`_wv4;6eP_`_h64EI
Iv^y*G@PJR2JOBUy

literal 0
HcmV?d00001

diff --git a/u_fix-glx-context-opengl-4.5.patch b/u_fix-glx-context-opengl-4.5.patch
deleted file mode 100644
index 853e966..0000000
--- a/u_fix-glx-context-opengl-4.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/glx/create_context.c
-+++ b/src/glx/create_context.c
-@@ -115,6 +115,9 @@ glXCreateContextAttribsARB(Display *dpy,
- #endif
- 
-    if (gc == NULL) {
-+      /* increment dpy->request in order to give a unique serial number to the
-+       * error */
-+      XNoOp(dpy);
-       /* -1 isn't a legal XID, which is sort of the point, we've failed
-        * before we even got to XID allocation.
-        */